aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* adding missing test coverageEugene Gilburg2014-07-181-0/+12
* marking private methods which dont work if called on their own anywaysEugene Gilburg2014-07-182-1/+5
* small refactors to actionview renderersEugene Gilburg2014-07-183-16/+15
* Merge pull request #16098 from tgxworld/fixes_to_request_testRafael Mendonça França2014-07-181-22/+14
|\
| * Remove redundant test.Guo Xiang Tan2014-07-181-11/+0
| * Fix duplicated test.Guo Xiang Tan2014-07-181-2/+6
| * Update test to clearly reflect what it is testing for.Guo Xiang Tan2014-07-181-5/+7
| * Update outdated test.Guo Xiang Tan2014-07-181-6/+3
* | Merge pull request #16212 from aantix/additional_migration_conflict_help_mess...Rafael Mendonça França2014-07-181-1/+2
|\ \
| * | 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
* | | Merge pull request #16221 from arthurnn/14886_prGodfrey Chan2014-07-184-2/+14
|\ \ \
| * | | Add CHANGELOG for #14886Arthur Neves2014-07-182-1/+6
| * | | LOCALHOST definition should match any 127.0.0.0/8 addressEarl J St Sauver2014-07-183-2/+9
|/ / /
* | | Merge pull request #15762 from arthurnn/better_error_on_bad_alias_methodMatthew Draper2014-07-183-10/+27
|\ \ \
| * | | Dont swallow errors when bad alias_methodArthur Neves2014-06-243-10/+27
* | | | Follow-up to #16097 [ci skip]Robin Dupret2014-07-182-4/+8
* | | | Merge pull request #16099 from tgxworld/pass_log_as_blockYves Senn2014-07-185-43/+46
|\ \ \ \ | |_|/ / |/| | |
| * | | Prefer to pass block when logging.Guo Xiang Tan2014-07-185-43/+46
|/ / /
* | | 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