aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` optionCarlos Galdino2012-06-056-22/+128
* Merge pull request #6622 from kennyj/fix_6591-32Rafael Mendonça França2012-06-042-1/+13
|\
| * Fix #6591. If a field with timezone isn't changed, we don't call will_change!.kennyj2012-06-041-1/+2
| * Add failing test for 3.2.5 datetime attribute regressionEvan Arnold2012-06-041-0/+11
|/
* Merge pull request #6593 from yahonda/skip_test_remove_column_with_array_as_a...Rafael Mendonça França2012-06-011-1/+3
|\
| * Skip test_remove_column_with_array_as_an_argument_is_deprecated with Oracle a...Yasuo Honda2012-06-021-1/+3
* | Allow to use mounted helpers in ActionView::TestCasePiotr Sarnacki2012-06-014-1/+24
* | Merge pull request #6588 from nbibler/polymorphic_to_modelJosé Valim2012-06-012-2/+34
|\ \
| * | Use to_model delegates for polymorphic route generationNathaniel Bibler2012-06-012-2/+34
| |/
* | Add release date of 3.2.5 on the CHANGELOGRafael Mendonça França2012-06-015-3/+34
* | Include routes.mounted_helpers into integration testsPiotr Sarnacki2012-06-013-2/+28
* | Merge pull request #6587 from amatsuda/controller_generator_remove_blank_line_32Rafael Mendonça França2012-06-012-2/+2
|\ \ | |/ |/|
| * remove unneeded blank line from !namespeced? controller generatorsAkira Matsuda2012-06-012-2/+2
|/
* bumping to 3.2.5Aaron Patterson2012-05-319-9/+9
* Restore behavior of Active Record 3.2.3 scopesAndrew White2012-06-014-31/+4
* Merge branch '3-2-rel' into 3-2-stableAaron Patterson2012-05-3116-13/+47
|\
| * bumping to 3.2.4Aaron Patterson2012-05-319-9/+9
| * adding security notifications to CHANGELOGsAaron Patterson2012-05-312-0/+6
| * Merge branch '3-2-stable-sec' into 3-2-relAaron Patterson2012-05-315-5/+66
| |\
| * | updating changelogsAaron Patterson2012-05-317-4/+32
| * | Merge pull request #6558 from parndt/fix_regressionAaron Patterson2012-05-301-3/+4
* | | Merge branch '3-2-stable-sec' into 3-2-stableAaron Patterson2012-05-3114-22/+83
|\ \ \ | | |/ | |/|
| * | Strip [nil] from parameters hash.Aaron Patterson2012-05-302-1/+28
| * | predicate builder should not recurse for determining where columns.Aaron Patterson2012-05-303-4/+38
| |/
| * bumping to 3.2.4.rc1Aaron Patterson2012-05-289-17/+17
* | Merge pull request #6562 from martinoconnor/generator-fix-stableRafael Mendonça França2012-05-302-2/+2
|\ \
| * | Changed symbol platform to platforms for the commented out call to gem 'theru...Martin O'Connor2012-05-302-2/+2
|/ /
* | Merge pull request #6558 from parndt/fix_regressionAaron Patterson2012-05-301-3/+4
|\ \
| * | Revert "Removes unneeded caching from ActiveRecord::Base.relation"Philip Arndt2012-05-311-3/+4
|/ /
* | Merge pull request #6477 from steveklabnik/close_discovered_pg_connectionRafael Mendonça França2012-05-301-1/+2
* | Merge pull request #6553 from erichmenge/3-2-stable-json-patchPiotr Sarnacki2012-05-304-10/+32
|\ \
| * | Deprecate ActiveSupport::JSON::VariableErich Menge2012-05-303-4/+20
| * | True, False, and Nil should be represented in as_json as themselves.Erich Menge2012-05-302-6/+12
* | | Merge pull request #5810 from kennyj/fix_5797Aaron Patterson2012-05-304-5/+15
|/ /
* | Merge pull request #6519 from oscardelben/3-2-stableCarlos Antonio da Silva2012-05-292-7/+11
|\ \
| * | Remove irrelevant assertionOscar Del Ben2012-05-291-7/+0
| * | Display annotations from .coffee files in `rake notes`Bartlomiej Kozal2012-05-282-7/+18
| |/
* | Merge pull request #6531 from freerange/3-2-stable-minitest-passthrough-excep...Rafael Mendonça França2012-05-292-2/+47
|\ \ | |/ |/|
| * Exceptions like Interrupt should not be rescued in tests.James Mead2012-05-292-2/+47
|/
* Fix railties_order when application object is passedPiotr Sarnacki2012-05-272-1/+5
* Merge pull request #6494 from pwim/no-memcache-requireJosé Valim2012-05-271-1/+0
|\
| * remove unnecessary memcache equire in ActionDispatch::Session::CacheStoreBrian Durand2012-05-261-1/+0
|/
* Merge pull request #5244 from fotos/myqsl2_wait_timeoutRafael Mendonça França2012-05-251-1/+1
* Merge pull request #5925 from Juanmcuello/pg_structure_dumpCarlos Antonio da Silva2012-05-241-2/+2
|\
| * Use Shellwords to scape arguments in db:structure:dump for PostgreSQL.Juan M. Cuello2012-05-221-2/+2
* | Merge pull request #6467 from aselder/3-2-stableAaron Patterson2012-05-231-10/+12
|\ \ | |/ |/|
| * Synchronize the ConnectionPool#release method to avoid thread safety issues [...Andrew Selder2012-05-231-10/+12
|/
* Merge pull request #6451 from chancancode/3-2-stable_restore_frozen_state_on_...Rafael Mendonça França2012-05-221-2/+4
|\
| * Fixes the build break caused by 9ee8528 in #6445.Godfrey Chan2012-05-221-2/+4
|/
* Merge pull request #6445 from chancancode/3-2-stable_restore_frozen_state_on_...Rafael Mendonça França2012-05-222-1/+13
|\