Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5946 from sikachu/3-2-stable-fix-merge-conflict | Santiago Pastorino | 2012-04-23 | 1 | -9/+11 |
|\ | | | | | Fix broken test from the earlier merge conflict | ||||
| * | Fix broken test from the earlier merge conflict | Prem Sichanugrist | 2012-04-23 | 1 | -9/+11 |
|/ | | | | Seriously people, please run the test before submitting pull request. | ||||
* | Merge pull request #5866 from tiegz/minor_fixes_3-2-stable | Aaron Patterson | 2012-04-23 | 2 | -42/+27 |
|\ | | | | | Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead | ||||
| * | converting some tests to assert_raises, and DRY'ing retrieve_variable changes | Tieg Zaharia | 2012-04-16 | 2 | -47/+23 |
| | | | | | | | | | | | | Conflicts: actionpack/test/template/render_test.rb | ||||
| * | catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead | Tieg Zaharia | 2012-04-16 | 2 | -1/+10 |
| | | |||||
* | | Merge pull request #5919 from joevandyk/rake-dsl-fix | Jeremy Kemper | 2012-04-23 | 1 | -1/+1 |
|\ \ | | | | | | | Only include Rake::DSL if it's defined (Rake >= 0.9) | ||||
| * | | Only include Rake::DSL if it's defined. | Joe Van Dyk | 2012-04-21 | 1 | -1/+1 |
| | | | | | | | | | | | | rake < 0.9 doesn't define Rake::DSL. | ||||
* | | | Merge pull request #5936 from arunagw/other_readme_fixes | Vijay Dev | 2012-04-23 | 6 | -6/+6 |
|\ \ \ | | | | | | | | | Updated other README to point 3-2-stable | ||||
| * | | | Updated other README to point 3-2-stable | Arun Agrawal | 2012-04-23 | 6 | -6/+6 |
| | | | | |||||
* | | | | Merge pull request #5935 from arunagw/readme_fixes_3-2-stable | Vijay Dev | 2012-04-23 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | As ARes is removed from master then 3-2-stable URL should be in README. | ||||
| * | | | ARes URL should be pointed to 3-2-stable tree not master. | Arun Agrawal | 2012-04-23 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #5896 from sferik/revert_5861 | Jeremy Kemper | 2012-04-21 | 2 | -4/+18 |
|\ \ \ | |/ / |/| | | Revert #5861. Feature-detect which MultiJson API to use. | ||||
| * | | Use `Object#respond_to?` to determine which MultiJson API to use | Erik Michaels-Ober | 2012-04-18 | 1 | -3/+17 |
| | | | |||||
| * | | Revert "multi_json is restricted to < 1.3 " | Erik Michaels-Ober | 2012-04-18 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 9b14e3ff80ee4044cfd89a11effcb5f52eaf888b. | ||||
* | | | Be sure to correctly fetch PK name from MySQL even if the PK has some custom ↵ | Akira Matsuda | 2012-04-19 | 2 | -1/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | option Backports #5900 Conflicts: activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb | ||||
* | | | Merge pull request #5898 from benedikt/3-2-stable | Jeremy Kemper | 2012-04-19 | 6 | -8/+40 |
|\ \ \ | |/ / |/| | | Readds the fix for #5667 and back ports the regression fix from #5718 | ||||
| * | | Removes unneeded caching from ActiveRecord::Base.relation | Benedikt Deicke | 2012-04-19 | 1 | -4/+3 |
| | | | |||||
| * | | Revert "Revert "Fix #5667. Preloading should ignore scoping."" | Benedikt Deicke | 2012-04-19 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1166d49f62ccab789be208112163ad13183224e2. Conflicts: activerecord/test/cases/associations/eager_test.rb | ||||
| * | | Adds test to check that circular preloading does not modify Model.unscoped ↵ | Benedikt Deicke | 2012-04-19 | 3 | -4/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | (as described in #5667) Conflicts: activerecord/test/cases/associations/eager_test.rb | ||||
| * | | Removes caching from ActiveRecord::Core::ClassMethods#relation | Benedikt Deicke | 2012-04-19 | 2 | -2/+6 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The #relation method gets called in four places and the return value was instantly cloned in three of them. The only place that did not clone was ActiveRecord::Scoping::Default::ClassMethods#unscoped. This introduced a bug described in #5667 and should really clone the relation, too. This means all four places would clone the relation, so it doesn't make a lot of sense caching it in the first place. The four places with calls to relations are: activerecord/lib/active_record/scoping/default.rb:110:in `block in build_default_scope'" activerecord/lib/active_record/scoping/default.rb:42:in `unscoped'" activerecord/lib/active_record/scoping/named.rb:38:in `scoped'" activerecord/lib/active_record/scoping/named.rb:52:in `scope_attributes'" Conflicts: activerecord/lib/active_record/core.rb | ||||
* | | Revert "Fix #5667. Preloading should ignore scoping." | Jeremy Kemper | 2012-04-18 | 3 | -20/+2 |
| | | | | | | | | | | | | | | | | Causes a subtle regression where record.reload includes the default scope. Hard to reproduce in isolation. Seems like the relation is getting infected by some previous usage. This reverts commit dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e. | ||||
* | | Add hook for add_resource_route | Santiago Pastorino | 2012-04-18 | 4 | -7/+21 |
| | | |||||
* | | Merge pull request #5894 from norman/3-2-fix-nil-logger | Aaron Patterson | 2012-04-18 | 1 | -1/+1 |
|\ \ | | | | | | | Fix nil logger on 3.2 | ||||
| * | | Check for nil logger | Norman Clarke | 2012-04-18 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #5874 from asanghi/3-2-stable | Jeremy Kemper | 2012-04-17 | 4 | -5/+5 |
|\ \ | |/ |/| | replace ruby-debug19 with debugger on Rails 3-2 stable | ||||
| * | Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a more ↵ | Aditya Sanghi | 2012-04-17 | 4 | -5/+5 |
|/ | | | | maintained debugger gem | ||||
* | Merge pull request #5861 from arunagw/multi_json_fix_3-2-stable | Jeremy Kemper | 2012-04-16 | 1 | -1/+1 |
|\ | | | | | Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3 | ||||
| * | multi_json is restricted to < 1.3 | Arun Agrawal | 2012-04-16 | 1 | -1/+1 |
| | | | | | | | | Some API changes are there above 1.3. 3-2-stable | ||||
* | | Add missing require in Active Support time zones (fixes #5854) | Piotr Sarnacki | 2012-04-15 | 1 | -0/+1 |
|/ | | | | | I also removed the other require as it's already present in `activesupport/core_ext/time/calculations` | ||||
* | "rails new -h" shows message in rails directory | ask | 2012-04-13 | 2 | -3/+17 |
| | |||||
* | fix typo in readme [ci skip] | Vijay Dev | 2012-04-12 | 1 | -1/+1 |
| | |||||
* | Fix code example in generator test case | Prem Sichanugrist | 2012-04-12 | 1 | -2/+2 |
| | |||||
* | Merge pull request #5820 from arunagw/more_ruby-2-0-fixes | Jeremy Kemper | 2012-04-12 | 1 | -1/+9 |
|\ | | | | | Update test for Ruby 2 compatibility | ||||
| * | test against ruby features in order to fix tests on Ruby 2.0 | Aaron Patterson | 2012-04-12 | 1 | -1/+9 |
|/ | |||||
* | Merge pull request #5800 from arunagw/bigdecimal_dup | Jeremy Kemper | 2012-04-10 | 2 | -3/+24 |
|\ | | | | | Backport BigDecimal#duplicable? feature check from master | ||||
| * | probably should require the objects we monkey patch. | Aaron Patterson | 2012-04-10 | 1 | -0/+1 |
| | | |||||
| * | bigdecimal can be duped on Ruby 2.0 | Aaron Patterson | 2012-04-10 | 2 | -2/+22 |
| | | | | | | | | | | | | Conflicts: activesupport/test/core_ext/duplicable_test.rb | ||||
| * | add the class name to the assertion message | Aaron Patterson | 2012-04-10 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #5799 from arunagw/readme_fix | Vijay Dev | 2012-04-10 | 1 | -2/+2 |
|\ | | | | | Readme fix | ||||
| * | README fix! [skip ci] | Arun Agrawal | 2012-04-10 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #5725 from kevmoo/remove_unused_castcode | Xavier Noria | 2012-04-09 | 1 | -2/+0 |
|\ \ | | | | | | | Remove unused castcode | ||||
| * | | Remove unused 'cast_code' variable | Kevin Moore | 2012-04-03 | 1 | -2/+0 |
| | | | |||||
* | | | rewords the section about default_url_options in the Action Controller ↵ | Xavier Noria | 2012-04-09 | 1 | -3/+4 |
| |/ |/| | | | | | Overview guide | ||||
* | | Merge pull request #5784 from rafaelfranca/default_url-3-2 | Santiago Pastorino | 2012-04-08 | 3 | -4/+4 |
|\ \ | | | | | | | [3-2-stable] Document that default_url_options must return a hash with symbolized keys | ||||
| * | | Document that default_url_options must return a hash with symbolized | Rafael Mendonça França | 2012-04-09 | 1 | -0/+1 |
| | | | | | | | | | | | | keys | ||||
| * | | default_url_options does not receive one argument anymore | Rafael Mendonça França | 2012-04-08 | 3 | -4/+3 |
| | | | |||||
* | | | Fix 'Everyday Git' link | Anil Wadghule | 2012-04-07 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #5765 from anildigital/3-2-stable | Vijay Dev | 2012-04-06 | 1 | -4/+4 |
|\ \ \ | |/ / |/| | | Update getting started guide to change Rails version to Rails 3.2 | ||||
| * | | Fix Rails version in getting started guide. | Anil Wadghule | 2012-04-06 | 1 | -4/+4 |
|/ / | |||||
* | | Merge pull request #5737 from rafaelfranca/3-2-stable | Santiago Pastorino | 2012-04-04 | 1 | -3/+1 |
|\ \ | | | | | | | Fix tests of benchmark with silence equals to true |