aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* gemspec assumes that user kept all generated files Suraj N. Kurapati2012-01-061-1/+1
* Revert "Merge pull request #2325 from pyromaniac/master"José Valim2012-01-062-13/+1
* Merge pull request #4343 from carlosantoniodasilva/activerecord-1.9-compatJosé Valim2012-01-052-4/+4
|\
| * Revert "Regexp.union seems to have different results in 1.8"Carlos Antonio da Silva2012-01-061-3/+3
| * Revert "Add return for 1.8.7"Carlos Antonio da Silva2012-01-061-1/+1
* | Merge pull request #4340 from rafaelfranca/patch-1José Valim2012-01-0526-66/+44
|\ \
| * | 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
|\ \
| * | 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
|\ \ | |/ |/|
| * 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
* 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. fixe...Tadas Tamošauskas2012-01-053-5/+8
* | Revert "remove deprecated API"Aaron Patterson2012-01-053-1/+20
* | 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 refactorBogdan Gusiev2011-11-151-58/+62
* | 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 requiresSergey Nartimov2011-12-212-7/+0
* | | Merge pull request #4192 from mptre/masterJosé Valim2012-01-052-1/+11
|\ \ \
| * | | 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 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.rbjuan david pastas2012-01-051-1/+0
| |/ / / /
* | | | | Merge pull request #4333 from rafaelfranca/patch-1José Valim2012-01-0513-35/+28
|\ \ \ \ \
| * | | | | Whitespaces :scissors:Rafael Mendonça França2012-01-052-7/+6
| * | | | | Refactor extract_selected_and_disabledRafael Mendonça França2012-01-051-1/+2
| * | | | | Change more Array.wrap to Kernel#ArrayRafael Mendonça França2012-01-059-19/+14
| * | | | | Use Kernel#Array in ActionController::HelpersRafael Mendonça França2012-01-051-2/+1
| * | | | | Use Kernel#Array instead of Array.wrap in view_pathsRafael Mendonça França2012-01-053-4/+3
| * | | | | Array.wrap is no longer needed in AbstractController::CallbacksRafael Mendonça França2012-01-051-2/+2
* | | | | | Merge pull request #4332 from norman/multibyteJosé Valim2012-01-058-355/+73
|\ \ \ \ \ \
| * | | | | | Use friendlier method nameNorman Clarke2012-01-052-3/+3
| * | | | | | Use friendlier method names for upcasing/downcasingNorman Clarke2012-01-052-12/+20