aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #16242 from vadivelan-k/content_verifierArthur Nogueira Neves2014-07-211-1/+1
|\ \ \
| * | | Touch option description grammatical error fixed [ci skip]vadivelan2014-07-211-1/+1
|/ / /
* | | Merge pull request #16240 from siddharthbhagwan/masterEileen M. Uchitelle2014-07-211-1/+1
|\ \ \ | |/ / |/| |
| * | Generator guide grammatical error fixed [ci skip]Siddharth Bhagwan2014-07-211-1/+1
|/ /
* | Merge pull request #16236 from y-yagi/patch-1Yves Senn2014-07-211-1/+1
|\ \ | |/ |/|
| * [ci skip] Fix code in Routing Guideyuuji.yaginuma2014-07-211-1/+1
|/
* Merge branch 'rm-remove-mocha'Rafael Mendonça França2014-07-1920-84/+182
|\
| * Stop requiring mocha automaticallyRafael Mendonça França2014-07-1914-5/+19
| * Stop using mocha on dbconsole_testRafael Mendonça França2014-07-151-44/+68
| * Stop using mocha on console_testRafael Mendonça França2014-07-071-15/+40
| * Set the application logger using configurationRafael Mendonça França2014-07-071-3/+5
| * Stop using mocha on configuration_testRafael Mendonça França2014-07-071-7/+23
| * Stop using mocha on app_rails_loader_testRafael Mendonça França2014-07-072-10/+27
* | Merge pull request #16230 from egilburg/before_type_cast_coverageRafael Mendonça França2014-07-191-0/+7
|\ \
| * | adding missing test for text area value before type castEugene Gilburg2014-07-191-0/+7
|/ /
* | Merge pull request #16224 from egilburg/renderer_refactorsRafael Mendonça França2014-07-194-17/+32
|\ \
| * | 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 #16227 from Aguynamedsteve/typo_correctionYves Senn2014-07-191-1/+1
|\ \ \
| * | | Fixed typo in commentSteve2014-07-191-1/+1
* | | | Merge pull request #16219 from skanev/fix-create-join-table-with-common-prefixYves Senn2014-07-195-2/+44
|\ \ \ \ | |_|/ / |/| | |
| * | | create_join_table uses same logic as HABTM reflectionsStefan Kanev2014-07-185-2/+44
* | | | 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