Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | Fix tests of benchmark with silence equals to true | Rafael Mendonça França | 2012-04-04 | 1 | -3/+1 |
|/ / | |||||
* | | Merge pull request #5188 from jlxw/patch-1 | Santiago Pastorino | 2012-04-04 | 1 | -1/+1 |
| | | | | | | | | logger.silence is deprecated | ||||
* | | Merge pull request #5727 from hone/ar_database_url_logging | Aaron Patterson | 2012-04-03 | 2 | -0/+66 |
|\ \ | |/ |/| | ActiveRecord configuration logging | ||||
| * | log which config format AR uses to connect with | Terence Lee | 2012-04-03 | 2 | -0/+23 |
| | | |||||
| * | test initializer logic for DATABASE_URL env var | Terence Lee | 2012-04-03 | 1 | -0/+43 |
|/ | |||||
* | DATABASE_URL allows omission of database.yml | Tim Pope | 2012-04-03 | 1 | -1/+3 |
| | |||||
* | Usage file in generators shouldn't be fetched only based on source_root | Piotr Sarnacki | 2012-04-02 | 3 | -5/+22 |
| | | | | | | | | In case `source_roout` is not set, `default_source_root` is used, which includes also `templates` directory. If there is no `templates` directory, `default_source_root` is not available and USAGE will not be displayed. USAGE should be also checked based on default directory excluding `templates`. | ||||
* | Fix the redirect when it receive blocks with arity of 1. | Rafael Mendonça França | 2012-03-31 | 2 | -1/+17 |
| | | | | Closes #5677 | ||||
* | Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find_select | Aaron Patterson | 2012-03-30 | 3 | -21/+29 |
|\ | | | | | Fixing Identity Map when using find select in rails 3.2 | ||||
| * | refactor instantiate method in base, so we remove nesting if's which make ↵ | Arturo Pie | 2012-03-29 | 2 | -12/+19 |
| | | | | | | | | | | | | | | | | the code harder to read. Minor changes to contain_all_columns in IdentityMap. Conflicts: activerecord/lib/active_record/base.rb | ||||
| * | refactor the checking of the attributes of the record in IdentityMap#add, so ↵ | Arturo Pie | 2012-03-29 | 2 | -5/+12 |
| | | | | | | | | it's more readable | ||||
| * | Do not add record to identity map if the record doesn't have values for all ↵ | Arturo Pie | 2012-03-29 | 1 | -1/+1 |
| | | | | | | | | the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record. | ||||
| * | Adds a test that breaks IM when using #select | Arturo Pie | 2012-03-29 | 1 | -12/+6 |
| | | |||||
* | | Merge branch '3-2-3' into 3-2-stable | Santiago Pastorino | 2012-03-30 | 10 | -9/+13 |
|\ \ | |||||
| * | | Bump up to 3.2.3 | Santiago Pastorino | 2012-03-30 | 9 | -9/+9 |
| | | | |||||
| * | | Remove the leading \n added by textarea on assert_select | Santiago Pastorino | 2012-03-30 | 3 | -0/+10 |
| | | | |||||
| * | | Bumping to 3.2.3.rc2 | Santiago Pastorino | 2012-03-29 | 9 | -9/+9 |
| | | |