aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Modified migration conflict message to remove the string concatenation.Jim Jones2014-07-181-3/+3
* Added additional help messaging when there's scaffolding being generated and ...Jim Jones2014-07-171-1/+2
* reporting is only done in one thread, so we can safely remove the lockAaron Patterson2014-07-171-1/+1
* %i doesn't work on 1.9Aaron Patterson2014-07-171-1/+1
* fix thread safety issuesAaron Patterson2014-07-171-4/+7
* pass the test reporter by referenceAaron Patterson2014-07-171-1/+4
* Merge pull request #16210 from sonnym/assert_valid_keys_in_validateMatthew Draper2014-07-183-0/+19
|\
| * check for valid options in validate methodsonnym2014-07-173-0/+18
* | fix filesystem race conditionAaron Patterson2014-07-171-1/+1
* | do not restart the service, just stop itAaron Patterson2014-07-171-1/+0
* | only parallelize on forking systemsAaron Patterson2014-07-171-1/+1
* | Disable some tests on SQLiteRafael Mendonça França2014-07-171-77/+77
* | Prefer if/else for this caseRafael Mendonça França2014-07-171-3/+2
* | Merge pull request #16188 from marianovalles/fix_rational_to_decimal_type_castRafael Mendonça França2014-07-173-9/+38
|\ \
| * | Fix decimal_test module and add new test for object responding to to_dMariano Valles2014-07-162-7/+15
| * | Fix case statement to use ::Numeric and ::StringMariano Valles2014-07-163-18/+25
| * | Change class evaluation for Rationals in cast_valueMariano Valles2014-07-162-5/+7
| * | Fix rational to decimal on type_cast_from_userMariano Valles2014-07-162-1/+13
* | | [EXPERIMENTAL] run actionpack tests in parallelAaron Patterson2014-07-171-0/+57
| |/ |/|
* | `recall` should be `path_parameters`, also make it requiredAaron Patterson2014-07-171-3/+3
* | pass the route name to define_url_helperAaron Patterson2014-07-173-23/+26
* | Make restore_attributes publicRafael Mendonça França2014-07-172-10/+20
* | use a strategy object for generating urls in named helpersAaron Patterson2014-07-172-21/+37
* | helper methods are public, so we can just call themAaron Patterson2014-07-171-4/+4
* | docs, `select` and friends with `multiple=true` include a blank string.Yves Senn2014-07-171-5/+3
* | Merge pull request #16198 from eileencodes/remove-need-for-macro-instance-varMatthew Draper2014-07-181-11/+14
|\ \
| * | Remove need for macro instance vareileencodes2014-07-171-11/+14
* | | Merge pull request #16205 from davejachimiak/remove_profile_and_benchmark_pointMatthew Draper2014-07-171-1/+0
|\ \ \ | |/ / |/| |
| * | Remove "profile and benchmark" line from command line guideDave Jachimiak2014-07-171-1/+0
|/ /
* | Merge pull request #16201 from noinkling/masterGodfrey Chan2014-07-161-5/+5
|\ \
| * | Fix broken list formatting [ci skip]noinkling2014-07-171-5/+5
* | | subclass Rails::EngineAaron Patterson2014-07-161-1/+2
|/ /
* | extract path building to a methodAaron Patterson2014-07-161-9/+11
* | break out path building logic to methodsAaron Patterson2014-07-161-14/+22
* | only extract :params from the options hash onceAaron Patterson2014-07-161-3/+2
* | we do not need to dup the options hash, it is private and a new object each callAaron Patterson2014-07-161-2/+2
* | push rails app testing upAaron Patterson2014-07-161-9/+13
* | Rails-ish apps should descend from Rails::RailtieAaron Patterson2014-07-164-14/+17
* | app should always be a class (I suppose)Aaron Patterson2014-07-161-1/+1
* | we should be checking if the app is a classAaron Patterson2014-07-161-1/+1
* | Merge pull request #16197 from cgriego/patch-1Rafael Mendonça França2014-07-161-1/+1
|\ \
| * | Remove unused 1:1 association :remote optionChris Griego2014-07-161-1/+1
|/ /
* | Merge pull request #16196 from yahonda/mysql_restrict_testMatthew Draper2014-07-172-8/+6
|\ \
| * | Revert "Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode"Yasuo Honda2014-07-172-8/+6
* | | Merge pull request #16195 from jonatack/patch-7Matthew Draper2014-07-171-4/+4
|\ \ \
| * | | Fix typos in string_ext_test.rb [ci skip]Jon Atack2014-07-161-4/+4
|/ / /
* | | Merge remote-tracking branch 'origin/master'Rafael Mendonça França2014-07-164-7/+62
|\ \ \
| * \ \ Merge pull request #16190 from oss92/word_truncationMatthew Draper2014-07-173-0/+49
| |\ \ \
| | * | | Added truncate_words method to activesupport stringsroot2014-07-163-0/+45
| * | | | extract inner options before delegating to the helperAaron Patterson2014-07-161-7/+13