github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
27,095 Commits 34 Branches 105 Tags
201e67ed365c797795df09fcb8a7bc7ecfdbb30d
Commit Graph

27095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Patterson
201e67ed36 adding tests to document behavior for #4817 2012-02-14 16:51:49 -08:00
Santiago Pastorino
7c79996c67 Rack body respond to each and not to join 
This fixes undef `to_str' for Rack::Chunked::Body when using
caches_action + streaming on an action

Closes #5027
 2012-02-14 21:53:38 -02:00
José Valim
5f9a5a51de Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo 
Always reenable _dump task in AR databases rake. Closes #5030
 2012-02-14 12:10:56 +01:00
José Valim
305d5d5e90 Fix deprecation warning in AS::Concern. 2012-02-13 15:29:26 +01:00
Jeremy Kemper
92acd5d0e7 Fix that failed tests should exit with a nonzero error code. 
Partially reverts 14c89e7285d4e7cd40a542fbc31d9345f60c3aa4.

Hat tip to @tenderlove for paring down the TestTask!
 2012-02-10 10:34:35 -08:00
Aaron Patterson
73fcbaaa78 Merge pull request #4988 from kennyj/fix_4720-3 
Fix GH #4720. Routing problem with nested namespace and already camelized controller option.
 2012-02-10 10:01:06 -08:00
José Valim
6d17b36778 Merge pull request #4941 from rafaelfranca/fix-build 
Use real table and columns for index test
 2012-02-08 06:42:32 -08:00
Rafael Mendonça França
7c167dd2de Use real table and columns for index test 2012-02-08 11:53:32 -02:00
José Valim
d3d807a173 Push proper test changes for previous commit conflicts. 2012-02-08 14:06:44 +01:00
Paul Sadauskas
0a75336c89 Handle nil in add_index :length option in MySQL 
Our schema.rb is being generated with an `add_index` line similar to this:

    add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil}

This is the same as it was on Rails 3.1.3, however, now when that
schema.rb is evaluated, its generating bad SQL in MySQL:

    Mysql::Error: You have an error in your SQL syntax; check the manual
    that corresponds to your MySQL server version for the right syntax
    to use near '))' at line 1: CREATE UNIQUE INDEX
    `xxx` ON `foo` (`foo`(8), `bar`())

This commit adds a check for nil on the length attribute to prevent the
empty parens from being output.

Conflicts:

	activerecord/test/cases/migration/index_test.rb

Signed-off-by: José Valim <jose.valim@gmail.com>
 2012-02-08 13:34:04 +01:00
Jon Leighton
77b4edce15 Fix attribute_before_type_cast for serialized attributes. Fixes #4837. 
Conflicts:

	activerecord/lib/active_record/core.rb
 2012-02-07 23:41:21 +00:00
Aaron Patterson
b3328779d0 always flush all logs. fixes #4277 2012-02-07 13:50:50 -08:00
Xavier Noria
dafc3c7a06 no need to check for this constant 2012-02-07 21:20:54 +01:00
José Valim
f3595b5924 Merge pull request #4916 from rmm5t/fix_force_ssl_redirect_with_params 
Fixed force_ssl redirects to include original query params
 2012-02-07 09:05:07 -08:00
Ryan McGeary
0e482b3681 Added unit test to cover changes to RouteSet.url_for 
ActionDispatch::Routing::RouteSet.url_for now handles passing params through to
ActionDispatch::Http::Url.url_for
 2012-02-07 11:56:26 -05:00
Markus Fenske
8c7378aae8 Fixed the documenation for 'to_xml' 2012-02-07 17:32:15 +01:00
José Valim
bc85fcb052 Merge pull request #4920 from guilleiguaran/revert-gemfile-edge 
In Rails 3.2.x --edge generate apps with rails 3-2-stable
 2012-02-07 05:31:20 -08:00
Guillermo Iguaran
5bfee55947 --edge option should generate app with rails 3-2-stable 2012-02-07 08:27:32 -05:00
Ryan McGeary
391e6a47db Fixed force_ssl redirects to include original query params 
`ActionController.force_ssl` redirects http URLs to their https equivalent;
however, when a URL contains a query string, the resulting redirect lacked the
original query string.
 2012-02-06 17:47:17 -05:00
Aaron Patterson
dd54137e82 Merge pull request #4912 from guilleiguaran/fix-edge-gemfile 
Add branch to sass-rails and coffee-rails for apps generated with --dev or --edge (3-2-stable)
 2012-02-06 10:39:13 -08:00
Guillermo Iguaran
995c076d34 Add branch to sass-rails and coffee-rails for apps generated with --dev or --edge options (3.2.x) 2012-02-06 13:32:42 -05:00
José Valim
ab44418881 Merge pull request #4908 from kennyj/fix_3864 
Fix url_for method's behavior. GH #3684.
 2012-02-06 17:03:42 +01:00
Santiago Pastorino
93f5361957 Merge pull request #4890 from kennyj/improvement_4883 
GH #4883. Optional start_day argument for Time#all_week
 2012-02-05 07:14:47 -08:00
kennyj
b0374018c2 GH #4883. Optional start_day argument for Time#all_week 2012-02-05 23:51:11 +09:00
José Valim
2bf2055f7a Clean up a bit default_response handling and cache format negotiation. 2012-02-04 16:01:01 +01:00
José Valim
44b9992c11 Merge pull request #4870 from sikachu/3-2-stable-responder-fix 
Fix override API response bug in respond_with
 2012-02-04 07:00:49 -08:00
José Valim
9cb0e12e46 Merge pull request #4879 from kennyj/fix_4873 
Fix GH #4873. Allow swapping same class middleware.
 2012-02-04 15:32:40 +01:00
Xavier Noria
ee6e3c128b let automatic EXPLAIN ignore CACHE notifications 2012-02-03 16:12:18 -08:00
Prem Sichanugrist
567ac65b42 Fix override API response bug in respond_with 
Default responder was only using the given respond block when user
requested for HTML format, or JSON/XML format with valid resource. This
fix the responder so that it will use the given block regardless of the
validity of the resource. Note that in this case you'll have to check
for object's validity by yourself in the controller.

Fixes #4796
 2012-02-03 14:26:34 -05:00
Aaron Patterson
9aa4c6d7ce Merge pull request #4868 from skult/3-2-stable 
Fix Issue #4819
 2012-02-03 09:10:59 -08:00
densya203
daa266536e Fix Issue #4819 
'uninitialized constant ActiveRecord::Deprecation in Rails3.2.1'

Just a typo of 'ActiveSupport::...'
 2012-02-04 00:51:08 +09:00
Aaron Patterson
4ca633e466 Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption 
Fix for SQLite binary data corrupter (to master branch)
 2012-02-02 09:16:06 -08:00
Jon Leighton
42dab646eb Merge pull request #4543 from jdelStrother/find_or_init 
Don't instantiate two objects in collection proxy / find_or_instantiate_by
 2012-02-01 23:19:25 +00:00
José Valim
780bf52085 Merge pull request #4827 from sikachu/3-2-stable-fix-plugin-new 
Fix plugin_new test failure from c8c84397
 2012-02-01 10:11:51 -08:00
Prem Sichanugrist
b673ca68f1 Fix plugin_new test failure from c8c84397 
`plugin_new` generator doesn't generate `sass-rails` in the Gemfile, so
you can't check for that.
 2012-02-01 13:09:33 -05:00
José Valim
0696a514bc Merge pull request #4822 from carlosantoniodasilva/strict-validation-3-2 
Generate strict validation error messages with attribute name (3-2-stable)
 2012-02-01 06:05:02 -08:00
Santiago Pastorino
21735d225d Merge pull request #4815 from kennyj/fix_4749 
Fix GH #4749. Remove branch options, because edge is not 3-2-stable.
 2012-02-01 06:03:21 -08:00
Carlos Antonio da Silva
91f8cf2264 Generate strict validation error messages with attribute name 
Backported from master.
 2012-02-01 11:55:07 -02:00
kennyj
c8c84397cd Fix GH #4749. Remove branch options, because edge is not 3-2-stable. 2012-02-01 15:12:05 +09:00
Santiago Pastorino
1444ec6c91 Merge pull request #4811 from rafaelfranca/3-2-stable-fix 
Fix broken build in 3-2-stable branch
 2012-01-31 17:54:26 -08:00
Rafael Mendonça França
f532cd1040 Fix broken tests added by 85c724d59 2012-01-31 23:39:29 -02:00
Jon Leighton
e1de54079b Improve deprecation message 2012-01-31 20:26:16 +00:00
Aaron Patterson
81f14a5433 Merge pull request #4735 from arton/master 
Re-launch assets:precompile task using original $0 if $0 is batch file so it works on Windows
 2012-01-31 11:00:17 -08:00
Aaron Patterson
60cb7d6af0 Merge pull request #4779 from bsodmike/bsodmike-3-2-stable 
Update comment in Gemfile re Unicorn (minor clarification)
 2012-01-31 10:36:22 -08:00
José Valim
bd93ba5b16 Merge pull request #4793 from kennyj/fix_4760 
[3-2-stable] Fix GH #4760. A Block was not evaluated.
 2012-01-31 07:09:56 -08:00
Jon Leighton
85c724d59e Merge pull request #4783 from gregolsen/ids_reader_fix 
ids_reader method fixed, test added to has_many association (for PostgreSQL)
 2012-01-31 13:51:09 +00:00
José Valim
7beb5a71f3 Merge pull request #4790 from marten/fix-require-deprecation-in-activesupport 
Fix Deprecation usage in ActiveSupport when requiring only parts of AS
 2012-01-31 05:29:11 -08:00
Marten Veldthuis
2380a2d76c Fix use of Deprecation without requiring active_support/deprecation in whiny nil 2012-01-31 14:19:59 +01:00
Marten Veldthuis
f3e1b21ca9 Fix use of Deprecation without requiring active_support/deprecation in message verifier 2012-01-31 14:19:59 +01:00
Marten Veldthuis
563be40c59 Fix use of Deprecation without requiring active_support/deprecation in ActiveSupport::Concern in Base64 2012-01-31 13:41:08 +01:00