aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Array parameters should not contain nil values.Aaron Patterson2012-06-112-2/+8
* Additional fix for CVE-2012-2661Ernie Miller2012-06-112-3/+9
* Change the string to use in test case.kennyj2012-06-112-2/+2
* Fix GH #3163. Should quote database on mysql/mysql2.kennyj2012-06-113-1/+22
* Merge pull request #6690 from suginoy/fix-templates-copyRafael Mendonça França2012-06-112-1/+13
* Merge pull request #6698 from yahonda/address_ora_911_masterRafael Mendonça França2012-06-112-2/+2
* Merge pull request #6521 from Empact/throw-resultRafael Mendonça França2012-06-102-1/+8
* Remove warningRafael Mendonça França2012-06-101-1/+1
* Add test to column alias in `exists?` SQL.Rafael Mendonça França2012-06-101-0/+6
* Minimal change to query generation of exists? that makes SQLServer and others...iaddict2012-06-101-1/+1
* Merge pull request #6688 from c42engineering/buffered_logger_level_while_crea...Rafael Mendonça França2012-06-102-2/+7
|\
| * buffered logger is initialized with the log level passed trough the initializerNiranjan Paranjape2012-06-092-2/+7
* | Merge pull request #6695 from kennyj/fix_6635Rafael Mendonça França2012-06-102-5/+14
* | Merge pull request #6693 from jkraemer/3-2-stableJosé Valim2012-06-101-1/+1
|\ \
| * | fix namespace collision with test-unit-activesupportJens Kraemer2012-06-101-1/+1
|/ /
* | Merge pull request #6687 from tiegz/3-2-optimizationsJosé Valim2012-06-091-1/+3
|\ \
| * | ActiveRecord#attributes optimization: minimize objects createdTieg Zaharia2012-06-091-1/+3
| |/
* | Merge pull request #6689 from arunagw/duplicate_test_removedAndrew White2012-06-091-16/+0
|\ \ | |/ |/|
| * Duplicate tests removed.Arun Agrawal2012-06-091-16/+0
|/
* Don't add sqlite3 to gemspec with -O on rails plugin newPiotr Sarnacki2012-06-082-0/+10
* Merge pull request #6678 from arunagw/fix_issue_6673Rafael Mendonça França2012-06-082-1/+9
|\
| * We should not include engine.rake file into rakeArun Agrawal2012-06-082-1/+9
* | Merge pull request #6677 from arunagw/3-2-stableRafael Mendonça França2012-06-081-2/+0
|\ \ | |/ |/|
| * Removed protected as we already doing it above. Arun Agrawal2012-06-081-2/+0
|/
* Fix railties test suitePiotr Sarnacki2012-06-081-2/+1
* Fix asset tags for files with more than one dotPiotr Sarnacki2012-06-074-1/+9
* Make test cover previous reversionJon Leighton2012-06-071-0/+1
* Revert "Perf: Don't load the association for #delete_all."Jon Leighton2012-06-076-45/+21
* Merge pull request #6642 from kuroda/3-2-activemodel-translation-patchJosé Valim2012-06-062-2/+7
|\
| * Fix human attribute_name to handle deeply nested attributesTsutomu Kuroda2012-06-062-2/+7
|/
* Revert "fix the Flash middleware loading the session on every request (very d...Rafael Mendonça França2012-06-053-23/+7
* Add test to flash sweep after two redirectsRafael Mendonça França2012-06-051-0/+20
* Merge pull request #6613 from carlosgaldino/3-2-data-confirmRafael Mendonça França2012-06-056-22/+128
|\
| * 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