| Commit message (Expand) | Author | Age | Files | Lines |
* | Revert "Perf: Don't load the association for #delete_all." | Jon Leighton | 2012-06-07 | 6 | -45/+21 |
* | Merge pull request #6642 from kuroda/3-2-activemodel-translation-patch | José Valim | 2012-06-06 | 2 | -2/+7 |
|\ |
|
| * | Fix human attribute_name to handle deeply nested attributes | Tsutomu Kuroda | 2012-06-06 | 2 | -2/+7 |
|/ |
|
* | Revert "fix the Flash middleware loading the session on every request (very d... | Rafael Mendonça França | 2012-06-05 | 3 | -23/+7 |
* | Add test to flash sweep after two redirects | Rafael Mendonça França | 2012-06-05 | 1 | -0/+20 |
* | Merge pull request #6613 from carlosgaldino/3-2-data-confirm | Rafael Mendonça França | 2012-06-05 | 6 | -22/+128 |
|\ |
|
| * | Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` option | Carlos Galdino | 2012-06-05 | 6 | -22/+128 |
|/ |
|
* | Merge pull request #6622 from kennyj/fix_6591-32 | Rafael Mendonça França | 2012-06-04 | 2 | -1/+13 |
|\ |
|
| * | Fix #6591. If a field with timezone isn't changed, we don't call will_change!. | kennyj | 2012-06-04 | 1 | -1/+2 |
| * | Add failing test for 3.2.5 datetime attribute regression | Evan Arnold | 2012-06-04 | 1 | -0/+11 |
|/ |
|
* | Merge pull request #6593 from yahonda/skip_test_remove_column_with_array_as_a... | Rafael Mendonça França | 2012-06-01 | 1 | -1/+3 |
|\ |
|
| * | Skip test_remove_column_with_array_as_an_argument_is_deprecated with Oracle a... | Yasuo Honda | 2012-06-02 | 1 | -1/+3 |
* | | Allow to use mounted helpers in ActionView::TestCase | Piotr Sarnacki | 2012-06-01 | 4 | -1/+24 |
* | | Merge pull request #6588 from nbibler/polymorphic_to_model | José Valim | 2012-06-01 | 2 | -2/+34 |
|\ \ |
|
| * | | Use to_model delegates for polymorphic route generation | Nathaniel Bibler | 2012-06-01 | 2 | -2/+34 |
| |/ |
|
* | | Add release date of 3.2.5 on the CHANGELOG | Rafael Mendonça França | 2012-06-01 | 5 | -3/+34 |
* | | Include routes.mounted_helpers into integration tests | Piotr Sarnacki | 2012-06-01 | 3 | -2/+28 |
* | | Merge pull request #6587 from amatsuda/controller_generator_remove_blank_line_32 | Rafael Mendonça França | 2012-06-01 | 2 | -2/+2 |
|\ \
| |/
|/| |
|
| * | remove unneeded blank line from !namespeced? controller generators | Akira Matsuda | 2012-06-01 | 2 | -2/+2 |
|/ |
|
* | bumping to 3.2.5 | Aaron Patterson | 2012-05-31 | 9 | -9/+9 |
* | Restore behavior of Active Record 3.2.3 scopes | Andrew White | 2012-06-01 | 4 | -31/+4 |
* | Merge branch '3-2-rel' into 3-2-stable | Aaron Patterson | 2012-05-31 | 16 | -13/+47 |
|\ |
|
| * | bumping to 3.2.4 | Aaron Patterson | 2012-05-31 | 9 | -9/+9 |
| * | adding security notifications to CHANGELOGs | Aaron Patterson | 2012-05-31 | 2 | -0/+6 |
| * | Merge branch '3-2-stable-sec' into 3-2-rel | Aaron Patterson | 2012-05-31 | 5 | -5/+66 |
| |\ |
|
| * | | updating changelogs | Aaron Patterson | 2012-05-31 | 7 | -4/+32 |
| * | | Merge pull request #6558 from parndt/fix_regression | Aaron Patterson | 2012-05-30 | 1 | -3/+4 |
* | | | Merge branch '3-2-stable-sec' into 3-2-stable | Aaron Patterson | 2012-05-31 | 14 | -22/+83 |
|\ \ \
| | |/
| |/| |
|
| * | | Strip [nil] from parameters hash. | Aaron Patterson | 2012-05-30 | 2 | -1/+28 |
| * | | predicate builder should not recurse for determining where columns. | Aaron Patterson | 2012-05-30 | 3 | -4/+38 |
| |/ |
|
| * | bumping to 3.2.4.rc1 | Aaron Patterson | 2012-05-28 | 9 | -17/+17 |
* | | Merge pull request #6562 from martinoconnor/generator-fix-stable | Rafael Mendonça França | 2012-05-30 | 2 | -2/+2 |
|\ \ |
|
| * | | Changed symbol platform to platforms for the commented out call to gem 'theru... | Martin O'Connor | 2012-05-30 | 2 | -2/+2 |
|/ / |
|
* | | Merge pull request #6558 from parndt/fix_regression | Aaron Patterson | 2012-05-30 | 1 | -3/+4 |
|\ \ |
|
| * | | Revert "Removes unneeded caching from ActiveRecord::Base.relation" | Philip Arndt | 2012-05-31 | 1 | -3/+4 |
|/ / |
|
* | | Merge pull request #6477 from steveklabnik/close_discovered_pg_connection | Rafael Mendonça França | 2012-05-30 | 1 | -1/+2 |
* | | Merge pull request #6553 from erichmenge/3-2-stable-json-patch | Piotr Sarnacki | 2012-05-30 | 4 | -10/+32 |
|\ \ |
|
| * | | Deprecate ActiveSupport::JSON::Variable | Erich Menge | 2012-05-30 | 3 | -4/+20 |
| * | | True, False, and Nil should be represented in as_json as themselves. | Erich Menge | 2012-05-30 | 2 | -6/+12 |
* | | | Merge pull request #5810 from kennyj/fix_5797 | Aaron Patterson | 2012-05-30 | 4 | -5/+15 |
|/ / |
|
* | | Merge pull request #6519 from oscardelben/3-2-stable | Carlos Antonio da Silva | 2012-05-29 | 2 | -7/+11 |
|\ \ |
|
| * | | Remove irrelevant assertion | Oscar Del Ben | 2012-05-29 | 1 | -7/+0 |
| * | | Display annotations from .coffee files in `rake notes` | Bartlomiej Kozal | 2012-05-28 | 2 | -7/+18 |
| |/ |
|
* | | Merge pull request #6531 from freerange/3-2-stable-minitest-passthrough-excep... | Rafael Mendonça França | 2012-05-29 | 2 | -2/+47 |
|\ \
| |/
|/| |
|
| * | Exceptions like Interrupt should not be rescued in tests. | James Mead | 2012-05-29 | 2 | -2/+47 |
|/ |
|
* | Fix railties_order when application object is passed | Piotr Sarnacki | 2012-05-27 | 2 | -1/+5 |
* | Merge pull request #6494 from pwim/no-memcache-require | José Valim | 2012-05-27 | 1 | -1/+0 |
|\ |
|
| * | remove unnecessary memcache equire in ActionDispatch::Session::CacheStore | Brian Durand | 2012-05-26 | 1 | -1/+0 |
|/ |
|
* | Merge pull request #5244 from fotos/myqsl2_wait_timeout | Rafael Mendonça França | 2012-05-25 | 1 | -1/+1 |
* | Merge pull request #5925 from Juanmcuello/pg_structure_dump | Carlos Antonio da Silva | 2012-05-24 | 1 | -2/+2 |
|\ |
|