aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* move alias method `sanitize_conditions` to a correct placeDmitry Polushkin2014-02-091-2/+1
* Merge pull request #13983 from hsbt/remove-warningGodfrey Chan2014-02-091-1/+1
|\
| * use File.exist? instead of File.exists?SHIBATA Hiroshi2014-02-091-1/+1
|/
* use feature detection to decide which implementation to useAaron Patterson2014-02-081-1/+1
* Merge pull request #13981 from Fortisque/kevin/postgresql_reaper_threadsafeAaron Patterson2014-02-085-4/+15
|\
| * Reaper has access to threadsafe active? callKevin Casey2014-02-085-4/+15
* | Merge pull request #13978 from Fortisque/kevin/validation_context_for_childrenAaron Patterson2014-02-084-1/+27
|\ \
| * | context in validation goes through has many relationshipKevin Casey2014-02-084-1/+27
* | | Merge pull request #13980 from mellowi/skipping_linked_folder_tests_if_symlin...Aaron Patterson2014-02-081-2/+6
|\ \ \ | |_|/ |/| |
| * | Skips linked folder tests if symlink is invalidMikko Johansson2014-02-091-2/+6
* | | Merge pull request #13979 from mellowi/windows_disallowed_static_files_skippedAaron Patterson2014-02-081-2/+7
|\| |
| * | Skips tests on Windows that create files with illegal charactersMikko Johansson2014-02-091-2/+7
* | | Merge pull request #13977 from Octember/masterAaron Patterson2014-02-082-0/+20
|\ \ \ | |/ / |/| |
| * | Fixed an issue where reloading of removed dependencies would cause an unexpec...Noah Lindner2014-02-082-0/+20
|/ /
* | Merge pull request #13974 from laurocaetano/test_case_for_autosave_with_accep...Rafael Mendonça França2014-02-083-0/+33
|\ \
| * | Add test case for autosave HasMany with accepts_nested_attributes.Lauro Caetano2014-02-083-0/+33
|/ /
* | Updated the cookie docs to use the safer JSON.{generate,parse}Godfrey Chan2014-02-081-5/+5
* | Rely on backticks instead of tt tags [ci skip]Robin Dupret2014-02-081-2/+2
* | docs, Cookie values are String based. Closes #12860. [ci skip]Yves Senn2014-02-081-7/+7
* | Adjust test value so that timezone has no effectAndrew White2014-02-071-1/+1
|/
* Merge pull request #13952 from prathamesh-sonpatki/testingYves Senn2014-02-071-1/+1
|\
| * [Testing Guide] Mention :unauthorized in assert_response explanation [ci skip]Prathamesh Sonpatki2014-02-071-1/+1
* | Merge pull request #13967 from fphilipe/fix-missing-action-view-constYves Senn2014-02-072-0/+6
|\ \
| * | Require action_view to fix missing constantPhilipe Fatio2014-02-072-0/+6
* | | Merge pull request #13968 from kintamanimatt/fix-wordy-sentenceYves Senn2014-02-071-6/+5
|\ \ \ | |/ / |/| |
| * | Fix wordy sentenceMatthew Nicholas Bradley2014-02-071-6/+5
|/ /
* | Merge pull request #13962 from iwiznia/test_controller_skip_action_classYves Senn2014-02-071-0/+16
|\ \ | |/ |/|
| * Tests that skips a controller filters that was set up using a classIonatan Wiznia2014-02-061-0/+16
|/
* Merge branch 'dump-schema-after-migration-flag' of git://github.com/emilsoman...Xavier Noria2014-02-068-1/+84
|\
| * Add config to disable schema dump after migrationEmil Soman2014-02-068-1/+84
* | docs, Associations also raise on name conflicts. [ci skip]Yves Senn2014-02-061-2/+3
* | synchronize 4.1 release notes with CHANGELOGS. [ci skip]Yves Senn2014-02-065-17/+95
* | update contribution doc grammar. [ci skip]dpmehta022014-02-061-5/+6
* | Fix to_query with empty arrays tooRafael Mendonça França2014-02-062-1/+8
* | Add CHANGELOG entryRafael Mendonça França2014-02-051-0/+14
* | Refatoring the method to avoid shot-circuit returnRafael Mendonça França2014-02-052-4/+9
* | Test with a blank valueRafael Mendonça França2014-02-051-2/+2
* | Move test to the right fileRafael Mendonça França2014-02-052-11/+9
* | Fixed "Hash#to_param confused by empty hash values #13892"Hincu Petru2014-02-052-0/+12
* | Merge pull request #13953 from seanwalbran/fix-humanize-match-referenceRafael Mendonça França2014-02-052-1/+5
|\ \
| * | fix interplay of humanize and html_escapeSean Walbran2014-02-052-1/+5
|/ /
* | Merge pull request #13938 from marcandre/sized_enumeratorRafael Mendonça França2014-02-057-30/+53
|\ \
| * | Return sized enumerator from Enumerable#index_byMarc-Andre Lafortune2014-02-053-7/+6
| * | Return sized enumerator from Batches#find_eachMarc-Andre Lafortune2014-02-056-4/+26
| * | Return sized enumerator from Batches#find_in_batchesMarc-Andre Lafortune2014-02-053-4/+25
| * | Strengthen test with different nb of rows and columnsMarc-Andre Lafortune2014-02-051-2/+4
| * | Remove obsolete test (builtin group_by is now used)Marc-Andre Lafortune2014-02-051-20/+0
| * | Remove obsolete line (was needed for Ruby 1.8.7 support)Marc-Andre Lafortune2014-02-051-1/+0
|/ /
* | remove gemnasium batch from README. [ci skip]Yves Senn2014-02-051-1/+0
* | Removed unused commented code [ci skip]Arun Agrawal2014-02-051-1/+0