Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
| * | | Add missing CHANGELOG entry | Santiago Pastorino | 2012-03-29 | 1 | -0/+2 |
| | | | |||||
| * | | Add missing CHANGELOG entry | Santiago Pastorino | 2012-03-29 | 1 | -0/+2 |
| | | | |||||
| * | | fix incorrect url in the deprecation message for vendor/plugins [ci skip] | Vijay Dev | 2012-03-29 | 1 | -1/+1 |
| | | | |||||
| * | | Set proper rendered_format when doing render :inline | Santiago Pastorino | 2012-03-28 | 2 | -2/+3 |
| | | | | | | | | | | | | Closes #5632 | ||||
| * | | Cover one more case in auth_token and remote forms | Piotr Sarnacki | 2012-03-28 | 2 | -17/+23 |
| | | | | | | | | | | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it. | ||||
| * | | Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms | Santiago Pastorino | 2012-03-28 | 5 | -14/+76 |
| | | | | | | | | | | | | Embed auth token in remote forms | ||||
| * | | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml | Santiago Pastorino | 2012-03-27 | 3 | -8/+12 |
| | | | | | | | | | | | | Textarea newline fix breaks haml (3-2-stable) | ||||
* | | | Fix #5667. Preloading should ignore scoping. | Jon Leighton | 2012-03-30 | 3 | -2/+20 |
| | | | | | | | | | | | | | | | | | | Conflicts: activerecord/test/cases/associations/eager_test.rb | ||||
* | | | Remove the leading \n added by textarea on assert_select | Santiago Pastorino | 2012-03-30 | 3 | -0/+10 |
| |/ |/| | |||||
* | | fix incorrect url in the deprecation message for vendor/plugins [ci skip] | Vijay Dev | 2012-03-29 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #5644 from andhapp/fix-config-asset-manifest-3-2 | Santiago Pastorino | 2012-03-28 | 1 | -1/+1 |
|\ \ | | | | | | | Changed the config.assets.manifest to nil | ||||
| * | | Changed the config.assets.manifest to nil in the comments in the production ↵ | Anuj Dutta | 2012-03-28 | 1 | -1/+1 |
|/ / | | | | | | | config template. | ||||
* | | Set proper rendered_format when doing render :inline | Santiago Pastorino | 2012-03-28 | 2 | -2/+3 |
| | | | | | | | | Closes #5632 | ||||
* | | Merge pull request #5640 from yahonda/address_ora_00918_with_oracle | Santiago Pastorino | 2012-03-28 | 1 | -1/+1 |
|\ \ | | | | | | | Address an error for test_has_many_through_polymorphic_has_one with Oracle | ||||
| * | | Change the order argument from ('id') to ('taggings.id') | Yasuo Honda | 2012-03-28 | 1 | -1/+1 |
| |/ | | | | | | | to address ORA-00918 error | ||||
* | | Cover one more case in auth_token and remote forms | Piotr Sarnacki | 2012-03-28 | 2 | -17/+23 |
| | | | | | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it. | ||||
* | | Fix #5549. | Jon Leighton | 2012-03-28 | 2 | -3/+7 |
| | | |||||
* | | Test for #5549. | Aaron Patterson | 2012-03-28 | 2 | -1/+16 |
| | | | | | | | | | | | | | | | | Cherry-picked from e96d04a2e4e244ea5053cb4e8ab97db604d0c796. Conflicts: activerecord/lib/active_record/attribute_methods/read.rb | ||||
* | | Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms | Santiago Pastorino | 2012-03-28 | 5 | -14/+76 |
|\ \ | | | | | | | Embed auth token in remote forms |