aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #4350 from kennyj/improve_3694José Valim2012-01-061-3/+3
|\ \ \ \ | | | | | | | | | | Don't fork a process when assets:precompile:nondigest is invoked in assets:precompile:all.
| * | | | Don't fork a process when assets:precompile:nondigest is invoked in ↵kennyj2012-01-061-3/+3
|/ / / / | | | | | | | | | | | | assets:precompile:all. Improve GH #3694.
* | | | Merge pull request #4348 from lest/change-array-wrapJosé Valim2012-01-061-2/+1
|\ \ \ \ | |/ / / |/| | | use Kernel#Array instead of Array.wrap in Rails::Generators::Actions
| * | | use Kernel#Array instead of Array.wrap in Rails::Generators::ActionsSergey Nartimov2012-01-061-2/+1
|/ / /
* | | Revert "Revert "More 1.9 way""Santiago Pastorino2012-01-062-4/+4
| | | | | | | | | | | | | | | Fixed failing tests This reverts commit 8350ce97f2065eed9638c595d3938a573d6fa343.
* | | Merge pull request #4346 from pyromaniac/masterJosé Valim2012-01-062-2/+14
|\ \ \ | | | | | | | | Nil values uniquines validation
| * | | Fixed nil field value uniqueness checkpyromaniac2012-01-062-2/+14
|/ / /
* | | Merge pull request #4342 from carlosantoniodasilva/fix-routing-testJosé Valim2012-01-063-5/+5
|\ \ \ | | | | | | | | Fix routing test and remove deprecated method
| * | | Remove deprecation warning from test related to old process apiCarlos Antonio da Silva2012-01-061-1/+1
| | | |
| * | | Fix routing test to use assert_equalCarlos Antonio da Silva2012-01-062-4/+4
| | | |
* | | | Revert "Merge pull request #2325 from pyromaniac/master"José Valim2012-01-062-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It breaks the build for mysql. This reverts commit 958d25df4a1b0d41ce5deeeb0739c93b49bbd18d, reversing changes made to 8f309e31057e1b26fefedb199ab0526126fb1fe4.
* | | | Merge pull request #4343 from carlosantoniodasilva/activerecord-1.9-compatJosé Valim2012-01-052-4/+4
|\ \ \ \ | | | | | | | | | | Activerecord 1.9 compat
| * | | | Revert "Regexp.union seems to have different results in 1.8"Carlos Antonio da Silva2012-01-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d80e4ee20e690dfc0f4ec31c41b873d607462872. No need to care about 1.8 anymore, so reverting :)
| * | | | Revert "Add return for 1.8.7"Carlos Antonio da Silva2012-01-061-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | This reverts commit 665ef116ac9000d514c03fc61b216513f5cb7b25. There is no need for the return anymore, so reverting.
* | | | Merge pull request #4340 from rafaelfranca/patch-1José Valim2012-01-0526-66/+44
|\ \ \ \ | | | | | | | | | | Remove more Array.wrap calls
| * | | | Whitespaces :scissors:Rafael Mendonça França2012-01-061-1/+1
| | | | |
| * | | | Remove Array.wrap calls in ActiveSupportRafael Mendonça França2012-01-066-18/+13
| | | | |
| * | | | Remove Array.wrap calls in ActiveRecordRafael Mendonça França2012-01-0613-30/+18
| | | | |
| * | | | Remove Array.wrap call in ActiveModelRafael Mendonça França2012-01-067-17/+12
| |/ / /
* | | | Merge pull request #4339 from rafaelfranca/patch-2José Valim2012-01-052-0/+2
|\ \ \ \ | | | | | | | | | | Require ActiveSupport::TestCase form ActiveSupport isolation tests
| * | | | Add test path to LOAD_PATH to fix load errorRafael Mendonça França2012-01-061-0/+1
| | | | |
| * | | | Require ActiveSupport::TestCase form ActiveSupport isolation testsRafael Mendonça França2012-01-061-0/+1
| |/ / /
* | | | Merge pull request #2325 from pyromaniac/masterJosé Valim2012-01-052-1/+13
|\ \ \ \ | |/ / / |/| | | Nil values uniquines validation
| * | | Fixed nil field value uniqueness checkpyromaniac2012-01-062-1/+13
|/ / /
* | | convert railties to use AS::TestCaseAaron Patterson2012-01-0535-35/+36
| | |
* | | use AS::TestCase as the base classAaron Patterson2012-01-0565-103/+103
| | |
* | | activeresource tests use AS::TestCaseAaron Patterson2012-01-0510-10/+10
| | |
* | | Revert "More 1.9 way"Aaron Patterson2012-01-051-2/+4
| | | | | | | | | | | | This reverts commit 675094b2757cf90399dadca4489b1036810ae570.
* | | AP tests should inherit from AS::TestCaseAaron Patterson2012-01-0518-22/+23
| | |
* | | test cases should inherit from AS::TestCaseAaron Patterson2012-01-053-2/+3
| | |
* | | test a subclass so that the removed method does not imact other testsAaron Patterson2012-01-052-3/+6
| | |
* | | Update actionpack/CHANGELOG.mdJosé Valim2012-01-061-2/+2
| | |
* | | Merge pull request #4337 from tadast/master-checkbox_patchJosé Valim2012-01-053-5/+8
|\ \ \ | | | | | | | | check_box helper with :disabled => true generates disabled hidden field. fixes #1953 (master)
| * | | check_box helper with :disabled => true generates disabled hidden field. ↵Tadas Tamošauskas2012-01-053-5/+8
| | | | | | | | | | | | | | | | fixes #1953
* | | | Revert "remove deprecated API"Aaron Patterson2012-01-053-1/+20
| | | | | | | | | | | | | | | | This reverts commit f53c247d10acbaacb0d61824cfce888c4b0520d2.
* | | | remove deprecated APIAaron Patterson2012-01-053-20/+1
| | | |
* | | | fix some whitespace errorsAaron Patterson2012-01-051-5/+5
| | | |
* | | | More 1.9 waySantiago Pastorino2012-01-051-4/+2
| | | |
* | | | Merge pull request #3637 from bogdan/compile_optionsJosé Valim2012-01-051-58/+62
|\ \ \ \ | |/ / / |/| | | AS::Callbacks::Callback refactor
| * | | AS::Callbacks::Callback refactorBogdan Gusiev2011-11-151-58/+62
| | | | | | | | | | | | | | | | | | | | | | | | In order to make Callbacks code always operate on valid peaces of code Concatenated Callback#start and Callback#end method into #apply method.
* | | | Use 1.9 waySantiago Pastorino2012-01-051-6/+1
| | | |
* | | | Merge pull request #4117 from lest/remove-deprecatedJosé Valim2012-01-052-7/+0
|\ \ \ \ | | | | | | | | | | remove status_code from AD::ShowExceptions and useless requires
| * | | | remove status_code from AD::ShowExceptions and useless requiresSergey Nartimov2011-12-212-7/+0
| | | | |
* | | | | Merge pull request #4192 from mptre/masterJosé Valim2012-01-052-1/+11
|\ \ \ \ \ | | | | | | | | | | | | Align rake notes
| * | | | | Align rake notes.Anton Lindqvist2011-12-262-1/+11
| | | | | |
* | | | | | Merge pull request #4322 from castlerock/minitest_pendingJosé Valim2012-01-051-33/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | ActiveSupport::Testing::Pending support for MiniTest only
| * | | | | | ActiveSupport::Testing::Pending support for MiniTest onlyVishnu Atrai2012-01-051-33/+1
| | | | | | |
* | | | | | | Merge pull request #4324 from juanpastas/patch-1José Valim2012-01-050-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update activerecord/lib/active_record/base.rb
| * | | | | | | Update activerecord/lib/active_record/base.rbjuan david pastas2012-01-051-1/+0
| |/ / / / / /
* | | | | | | Merge pull request #4333 from rafaelfranca/patch-1José Valim2012-01-0513-35/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Change more Array.wrap calls