Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | We should finalize the routes as soon as possible and not wait for the ↵ | José Valim | 2012-01-06 | 2 | -3/+1 |
| | | | | controller to be loaded. | ||||
* | Do not stub id here | Santiago Pastorino | 2012-01-06 | 1 | -6/+6 |
| | |||||
* | Merge pull request #4351 from norman/multibyte | José Valim | 2012-01-06 | 3 | -5/+32 |
|\ | | | | | Implement #swapcase and #swapcase! for multibyte strings | ||||
| * | Improve doc consistency | Norman Clarke | 2012-01-06 | 1 | -3/+3 |
| | | |||||
| * | Implement Chars#swapcase. | Norman Clarke | 2012-01-06 | 3 | -2/+29 |
| | | |||||
* | | Merge pull request #4350 from kennyj/improve_3694 | José Valim | 2012-01-06 | 1 | -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 ↵ | kennyj | 2012-01-06 | 1 | -3/+3 |
|/ / | | | | | | | assets:precompile:all. Improve GH #3694. | ||||
* | | Merge pull request #4348 from lest/change-array-wrap | José Valim | 2012-01-06 | 1 | -2/+1 |
|\ \ | |/ |/| | use Kernel#Array instead of Array.wrap in Rails::Generators::Actions | ||||
| * | use Kernel#Array instead of Array.wrap in Rails::Generators::Actions | Sergey Nartimov | 2012-01-06 | 1 | -2/+1 |
|/ | |||||
* | Revert "Revert "More 1.9 way"" | Santiago Pastorino | 2012-01-06 | 2 | -4/+4 |
| | | | | | Fixed failing tests This reverts commit 8350ce97f2065eed9638c595d3938a573d6fa343. | ||||
* | Merge pull request #4346 from pyromaniac/master | José Valim | 2012-01-06 | 2 | -2/+14 |
|\ | | | | | Nil values uniquines validation | ||||
| * | Fixed nil field value uniqueness check | pyromaniac | 2012-01-06 | 2 | -2/+14 |
|/ | |||||
* | Merge pull request #4342 from carlosantoniodasilva/fix-routing-test | José Valim | 2012-01-06 | 3 | -5/+5 |
|\ | | | | | Fix routing test and remove deprecated method | ||||
| * | Remove deprecation warning from test related to old process api | Carlos Antonio da Silva | 2012-01-06 | 1 | -1/+1 |
| | | |||||
| * | Fix routing test to use assert_equal | Carlos Antonio da Silva | 2012-01-06 | 2 | -4/+4 |
| | | |||||
* | | Revert "Merge pull request #2325 from pyromaniac/master" | José Valim | 2012-01-06 | 2 | -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-compat | José Valim | 2012-01-05 | 2 | -4/+4 |
|\ \ | | | | | | | Activerecord 1.9 compat | ||||
| * | | Revert "Regexp.union seems to have different results in 1.8" | Carlos Antonio da Silva | 2012-01-06 | 1 | -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 Silva | 2012-01-06 | 1 | -1/+1 |
| |/ | | | | | | | | | | | This reverts commit 665ef116ac9000d514c03fc61b216513f5cb7b25. There is no need for the return anymore, so reverting. | ||||
* | | Merge pull request #4340 from rafaelfranca/patch-1 | José Valim | 2012-01-05 | 26 | -66/+44 |
|\ \ | | | | | | | Remove more Array.wrap calls | ||||
| * | | Whitespaces :scissors: | Rafael Mendonça França | 2012-01-06 | 1 | -1/+1 |
| | | | |||||
| * | | Remove Array.wrap calls in ActiveSupport | Rafael Mendonça França | 2012-01-06 | 6 | -18/+13 |
| | | | |||||
| * | | Remove Array.wrap calls in ActiveRecord | Rafael Mendonça França | 2012-01-06 | 13 | -30/+18 |
| | | | |||||
| * | | Remove Array.wrap call in ActiveModel | Rafael Mendonça França | 2012-01-06 | 7 | -17/+12 |
| |/ | |||||
* | | Merge pull request #4339 from rafaelfranca/patch-2 | José Valim | 2012-01-05 | 2 | -0/+2 |
|\ \ | | | | | | | Require ActiveSupport::TestCase form ActiveSupport isolation tests | ||||
| * | | Add test path to LOAD_PATH to fix load error | Rafael Mendonça França | 2012-01-06 | 1 | -0/+1 |
| | | | |||||
| * | | Require ActiveSupport::TestCase form ActiveSupport isolation tests | Rafael Mendonça França | 2012-01-06 | 1 | -0/+1 |
| |/ | |||||
* | | Merge pull request #2325 from pyromaniac/master | José Valim | 2012-01-05 | 2 | -1/+13 |
|\ \ | |/ |/| | Nil values uniquines validation | ||||
| * | Fixed nil field value uniqueness check | pyromaniac | 2012-01-06 | 2 | -1/+13 |
|/ | |||||
* | convert railties to use AS::TestCase | Aaron Patterson | 2012-01-05 | 35 | -35/+36 |
| | |||||
* | use AS::TestCase as the base class | Aaron Patterson | 2012-01-05 | 65 | -103/+103 |
| | |||||
* | activeresource tests use AS::TestCase | Aaron Patterson | 2012-01-05 | 10 | -10/+10 |
| | |||||
* | Revert "More 1.9 way" | Aaron Patterson | 2012-01-05 | 1 | -2/+4 |
| | | | | This reverts commit 675094b2757cf90399dadca4489b1036810ae570. | ||||
* | AP tests should inherit from AS::TestCase | Aaron Patterson | 2012-01-05 | 18 | -22/+23 |
| | |||||
* | test cases should inherit from AS::TestCase | Aaron Patterson | 2012-01-05 | 3 | -2/+3 |
| | |||||
* | test a subclass so that the removed method does not imact other tests | Aaron Patterson | 2012-01-05 | 2 | -3/+6 |
| | |||||
* | Update actionpack/CHANGELOG.md | José Valim | 2012-01-06 | 1 | -2/+2 |
| | |||||
* | Merge pull request #4337 from tadast/master-checkbox_patch | José Valim | 2012-01-05 | 3 | -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šauskas | 2012-01-05 | 3 | -5/+8 |
| | | | | | | | | fixes #1953 | ||||
* | | Revert "remove deprecated API" | Aaron Patterson | 2012-01-05 | 3 | -1/+20 |
| | | | | | | | | This reverts commit f53c247d10acbaacb0d61824cfce888c4b0520d2. | ||||
* | | remove deprecated API | Aaron Patterson | 2012-01-05 | 3 | -20/+1 |
| | | |||||
* | | fix some whitespace errors | Aaron Patterson | 2012-01-05 | 1 | -5/+5 |
| | | |||||
* | | More 1.9 way | Santiago Pastorino | 2012-01-05 | 1 | -4/+2 |
| | | |||||
* | | Merge pull request #3637 from bogdan/compile_options | José Valim | 2012-01-05 | 1 | -58/+62 |
|\ \ | |/ |/| | AS::Callbacks::Callback refactor | ||||
| * | AS::Callbacks::Callback refactor | Bogdan Gusiev | 2011-11-15 | 1 | -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 way | Santiago Pastorino | 2012-01-05 | 1 | -6/+1 |
| | | |||||
* | | Merge pull request #4117 from lest/remove-deprecated | José Valim | 2012-01-05 | 2 | -7/+0 |
|\ \ | | | | | | | remove status_code from AD::ShowExceptions and useless requires | ||||
| * | | remove status_code from AD::ShowExceptions and useless requires | Sergey Nartimov | 2011-12-21 | 2 | -7/+0 |
| | | | |||||
* | | | Merge pull request #4192 from mptre/master | José Valim | 2012-01-05 | 2 | -1/+11 |
|\ \ \ | | | | | | | | | Align rake notes | ||||
| * | | | Align rake notes. | Anton Lindqvist | 2011-12-26 | 2 | -1/+11 |
| | | | |