Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't try to EXPLAIN select_db calls | Daniel Schierbeck | 2013-05-12 | 3 | -1/+12 |
| | | | | Now with a non-broken test. | ||||
* | Revert "Don't try to EXPLAIN select_db calls" | Xavier Noria | 2013-05-11 | 2 | -8/+1 |
| | | | | | | Reason: This was backported, but the test does not pass as is. This reverts commit a33d320cf4b57fabd9c299b09c217ee3955ecc77. | ||||
* | So not make Fixnum#/ private on Ruby verions less than 1.9.3 | Rafael Mendonça França | 2013-05-10 | 1 | -4/+3 |
| | | | | In those version to_date call Fixnum#/, what will cause a failure | ||||
* | Fix test to ruby 2.0 | Rafael Mendonça França | 2013-05-10 | 1 | -2/+9 |
| | | | | The default enconding changed on Ruby 2.0 | ||||
* | Merge pull request #10557 from arunagw/pluck-refactor-using-map | Andrew White | 2013-05-10 | 1 | -1/+1 |
|\ | | | | | Using map. No need to run query again | ||||
| * | Using map. No need to run query again | Arun Agrawal | 2013-05-10 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #10555 from dasch/dasch/3-2-stable | Xavier Noria | 2013-05-10 | 2 | -1/+8 |
|\ | | | | | Don't try to EXPLAIN select_db calls | ||||
| * | Don't try to EXPLAIN select_db calls | Daniel Schierbeck | 2013-05-10 | 2 | -1/+8 |
| | | |||||
* | | Merge pull request #10552 from arunagw/pluck-fixed-3-2-stable | Rafael Mendonça França | 2013-05-10 | 2 | -6/+7 |
|\ \ | | | | | | | Pluck fixed 3 2 stable | ||||
| * | | Fixed pluck to be working with selects. | Arun Agrawal | 2013-05-10 | 2 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #9777 for details. Previously pluck is not returning what we wanted to Added a test also to make sure it's working fine. This will also fix the build for 1.8.7 as we were doing some sort on hash. Thanks @pixeltrix for helping me out. Thanks @linduxed for pairing with me. | ||||
| * | | Remove useless else | Arun Agrawal | 2013-05-10 | 1 | -3/+0 |
|/ / | |||||
* | | Revert "Merge pull request #8209 from senny/backport_8176" | Rafael Mendonça França | 2013-05-08 | 3 | -6/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 724020278480855bddfe749c91f1074d4f50f3c6, reversing changes made to e4e2bcce75b85fb8c1c49509a17bd5dfe6034c32. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb Reason: This caused a regression since it changed the behavior in a stable release. Fixes #9777 | ||||
* | | Revert "Remove unicode character encoding from ActiveSupport::JSON.encode" | Rafael Mendonça França | 2013-05-08 | 3 | -23/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 815a9431ab61376a7e8e1bdff21f87bc557992f8. Conflicts: activesupport/test/json/encoding_test.rb Reason: This was causing a regression where the resulting string is always returning UTF-8. Also it changes the behavior of this method on a stable release. Fixes #9498. | ||||
* | | Merge pull request #10496 from arunagw/build-fix-scaffold-generator | Carlos Antonio da Silva | 2013-05-07 | 1 | -1/+1 |
|\ \ | | | | | | | Build fix for scaffold generator | ||||
| * | | Build fix for scaffold generator | Arun Agrawal | 2013-05-07 | 1 | -1/+1 |
|/ / | | | | | 3-2 behaves different when scaffolding. | ||||
* | | Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroy | Rafael Mendonça França | 2013-05-06 | 3 | -1/+28 |
| | | | | | | | | | | | | | | | | | | | | | | Confirm a record has not already been destroyed before decrementing counter cache Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/builder/belongs_to.rb | ||||
* | | Merge pull request #10478 from cainlevy/patch-1 | Rafael Mendonça França | 2013-05-06 | 1 | -1/+1 |
| | | | | | | | | | | | | use canonical #controller_path logic in controller test cases Conflicts: actionpack/lib/action_controller/test_case.rb | ||||
* | | Merge pull request #10406 from greenriver/distance_of_time_rational | Rafael Mendonça França | 2013-05-06 | 2 | -1/+6 |
|\ \ | | | | | | | Correct time_ago_in_words to handle situation where Fixnum#/ returns a Rational (thanks to mathn) | ||||
| * | | Merging in fix from #8222 | Ben Tucker | 2013-05-06 | 2 | -1/+6 |
| |/ | |||||
* | | Merge pull request #10466 from prathamesh-sonpatki/scaffold-assets | Carlos Antonio da Silva | 2013-05-05 | 1 | -4/+4 |
| | | | | | | | | Fix tests related to scaffolding generator with --assets=false switch | ||||
* | | Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-master | Rafael Mendonça França | 2013-05-04 | 3 | -1/+20 |
|/ | | | | | | | | | | Fixes Scaffold generator with --assets=false Conflicts: railties/CHANGELOG.md Conflicts: railties/CHANGELOG.md railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb | ||||
* | adding test for the symbol refs | Aaron Patterson | 2013-04-26 | 1 | -0/+7 |
| | |||||
* | just clear the caches on clear! rather than replacing. fixes #10251 | Aaron Patterson | 2013-04-17 | 1 | -8/+4 |
| | |||||
* | adding a test for root path in the app | Aaron Patterson | 2013-04-17 | 1 | -0/+24 |
| | |||||
* | Merge pull request #10246 from prathamesh-sonpatki/3.2.13-https-rubygems | Carlos Antonio da Silva | 2013-04-17 | 1 | -1/+1 |
|\ | | | | | Using secure source https://rubygems.org when generating new plugin with Rails 3.2 | ||||
| * | Use secure source in generated Gemfile for creating new plugin. Closes #10245 | Prathamesh Sonpatki | 2013-04-17 | 1 | -1/+1 |
| | | |||||
* | | Fix "Scaling Rails Screencasts" link in caching guide | Carlos Antonio da Silva | 2013-04-16 | 1 | -1/+1 |
|/ | | | | Closes #10241 [ci skip] | ||||
* | Merge pull request #9688 from alexeymuranov/doc-nested-attributes-3-2 | Carlos Antonio da Silva | 2013-04-13 | 1 | -17/+41 |
|\ | | | | | 3-2-stable documentation: the possibility to use a hash of hashes for nested attributes | ||||
| * | Document nested attributes as hash of hashes | Alexey Muranov | 2013-04-13 | 1 | -17/+41 |
|/ | | | | | | Document the possibility to use a hash of hashes for nested attributes for a one-to-many association (in addition to the documented possibility to use an array of hashes). Align indentation in comments. | ||||
* | Merge pull request #10172 from senny/10098_backport | Rafael Mendonça França | 2013-04-11 | 4 | -1/+13 |
|\ | | | | | Backport: Correctly parse bigint defaults in PostgreSQL | ||||
| * | Correctly parse bigint defaults in PostgreSQL, Backpost #10098. | Erik Peterson | 2013-04-11 | 4 | -1/+13 |
|/ | | | | | | | | Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb activerecord/test/cases/schema_dumper_test.rb | ||||
* | Merge branch '3-2-later' into 3-2-stable | Aaron Patterson | 2013-04-09 | 1 | -0/+10 |
|\ | | | | | | | | | * 3-2-later: adding test for CVE | ||||
| * | adding test for CVE | Aaron Patterson | 2013-02-09 | 1 | -0/+10 |
| | | |||||
* | | Improve the changelog entry [ci skip] | Rafael Mendonça França | 2013-04-05 | 1 | -3/+4 |
| | | |||||
* | | Merge pull request #10105 from rmm5t/fix-explicit-name-on-multiple-fields | Rafael Mendonça França | 2013-04-05 | 3 | -8/+24 |
|\ \ | | | | | | | Fix explicit names on multiple file fields | ||||
| * | | Fix explicit names on multiple file fields | Ryan McGeary | 2013-04-05 | 3 | -8/+24 |
|/ / | | | | | | | | | | | | | | | If a file field tag is passed the multiple option, it is turned into an array field (appending "[]"), but if the file field is passed an explicit name as an option, leave the name alone (do not append "[]"). Fixes #9830 | ||||
* | | Fix typo in view name | Carlos Antonio da Silva | 2013-04-03 | 2 | -1/+1 |
| | | | | | | | | Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428 | ||||
* | | Use 1.8 hash style in test views | Carlos Antonio da Silva | 2013-04-03 | 2 | -2/+2 |
| | | | | | | | | Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428 | ||||
* | | Merge pull request #7792 from seejee/chained_scopes_preload_properly | Carlos Antonio da Silva | 2013-04-03 | 4 | -2/+22 |
|\ \ | | | | | | | Fixes Issue #7490: Chained scopes will preload properly | ||||
| * | | Chained scopes will be preloaded properly. Fixes #7490 | Chris Geihsler | 2013-04-03 | 4 | -2/+22 |
| | | | |||||
* | | | Common behavior with adding formats to lookup_context for TemplateRenderer ↵ | Dmitry Vorotilin | 2013-04-02 | 12 | -4/+33 |
| | | | | | | | | | | | | and PartialRenderer | ||||
* | | | Fix formatting and minor review in AP changelog | Carlos Antonio da Silva | 2013-03-30 | 1 | -9/+8 |
| | | | | | | | | | | | | Sentences starting with # are considered headings. | ||||
* | | | Add attr_accessible to the Getting Started Guide. | Steve Klabnik | 2013-03-29 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | This was brought up in #9995, but is only present in 3-2-stable, since mass assignment is removed from Rails 4. | ||||
* | | | Removing explain support warning from the Railtie | Rafael Mendonça França | 2013-03-28 | 2 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | This is causing a regression since the Active Record Railtie is trying to connect to the development database in the application boot. See https://github.com/rails/rails/pull/6197#issuecomment-15199273 | ||||
* | | | Merge pull request #9943 from fredwu/test_fix_for_74e59ea | Carlos Antonio da Silva | 2013-03-26 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixed test failures on 1.8.7 caused by 74e59ea | ||||
| * | | | Fixed test failures on 1.8.7 caused by 74e59ea | Fred Wu | 2013-03-27 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #9576 from ↵ | Rafael Mendonça França | 2013-03-26 | 3 | -1/+18 |
|\ \ \ | | | | | | | | | | | | | | | | | fredwu/backport_fix_explicitly_inheraitance_column_to_3_2_stable [Backport to 3-2-stable] Don't reset inheritance_column when setting explicitly. | ||||
| * | | | Added changelog for 55e2954 | Fred Wu | 2013-03-27 | 1 | -0/+5 |
| | | | | |||||
| * | | | Don't reset inheritance_column when setting explicitly. | Fred Wu | 2013-03-27 | 2 | -1/+13 |
|/ / / | | | | | | | This is backported from master (cdfcbc4). | ||||
* | | | Merge pull request #9899 from macksmind/backport_5808 | Jeremy Kemper | 2013-03-24 | 3 | -6/+60 |
|\ \ \ | | | | | | | | | Backport #5808 |