aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* set engine's route in the functional test is generated in the engineyuuji.yaginuma2015-05-313-0/+24
* Attempt to fix travis failuresSean Griffin2015-05-301-0/+3
* Ensure symbols passed to `select` are always quotedSean Griffin2015-05-304-10/+37
* Add docs and changelog entry for 73aab03 [ci skip]Sean Griffin2015-05-302-1/+15
* Merge pull request #20380 from kamipo/add_changelog_for_17654Eileen M. Uchitelle2015-05-301-0/+13
|\
| * Add CHANGELOG entry for #17654 [ci skip]Ryuta Kamizono2015-05-301-0/+13
|/
* Merge pull request #20378 from vngrs/fix_doc_of_match_methodKasper Timm Hansen2015-05-301-3/+6
|\
| * match method doc fix [ci skip]Mehmet Emin İNAÇ2015-05-301-3/+6
|/
* Merge pull request #20375 from yoongkang/docfixClaudio B.2015-05-301-1/+1
|\
| * [ci skip] match without via is now deprecatedYoong Kang Lim2015-05-301-1/+1
* | Merge pull request #20370 from manishspuri/masterGodfrey Chan2015-05-308-4/+56
|\ \ | |/ |/|
| * Add test to ensure tmp:clear works when tmp is missingYoong Kang Lim2015-05-301-0/+7
| * Generate a `.keep` file in `tmp` folderYoong Kang Lim2015-05-304-1/+37
| * `rake restart` should work without a `tmp` folderYoong Kang Lim2015-05-303-3/+12
|/
* Require yaml for isolation testRafael Mendonça França2015-05-291-0/+1
* Merge pull request #20370 from manishspuri/masterKasper Timm Hansen2015-05-292-5/+5
|\
| * formatting changesunknown2015-05-292-5/+5
|/
* Make the wording less confusingRafael Mendonça França2015-05-291-1/+1
* Merge pull request #20367 from manishspuri/masterRafael Mendonça França2015-05-292-2/+2
|\
| * minor text changeManish Puri2015-05-291-1/+1
| * Update inline_preview_interceptor.rbManish Puri2015-05-291-1/+1
|/
* Merge pull request #20365 from repinel/revert-19878-replace_alias_chains_with...Rafael Mendonça França2015-05-295-79/+89
|\
| * Revert "Replace use of alias chains with prepend at core_ext/date and core_ex...Roque Pinel2015-05-295-79/+89
* | Merge pull request #20366 from Gaurav2728/gaurav-mailerMatthew Draper2015-05-301-1/+0
|\ \ | |/ |/|
| * not require mail fileGaurav Sharma2015-05-291-1/+0
|/
* Merge pull request #20364 from ernie/update-serialize-docsSean Griffin2015-05-291-0/+9
|\
| * Update docs for ActiveRecord `serialize`Ernie Miller2015-05-291-0/+9
|/
* Merge pull request #20355 from segiddins/seg-bundler-1-10Santiago Pastorino2015-05-292-2/+4
|\
| * Generate Bundler 1.10.1 lockfileSamuel E. Giddins2015-05-281-0/+3
| * Revert "Use bundler < 1.10 until its bugs are fixed"Samuel E. Giddins2015-05-281-1/+1
| * Revert "Uninstall bundler 1.10"Samuel E. Giddins2015-05-281-1/+0
| * Revert "Force the uninstall"Samuel E. Giddins2015-05-281-1/+1
* | Merge pull request #20358 from tgxworld/remove_codeSantiago Pastorino2015-05-291-2/+0
|\ \
| * | Remove unused code.Guo Xiang Tan2015-05-291-2/+0
| |/
* | Merge pull request #20354 from arunagw/fix-warning-ambiguous-first-argumentYves Senn2015-05-291-1/+1
|\ \ | |/ |/|
| * Fix warning about ambiguous first argumentArun Agrawal2015-05-291-1/+1
|/
* Merge pull request #19878 from pabloh/replace_alias_chains_with_prependRafael Mendonça França2015-05-285-89/+79
|\
| * Replace use of alias chains with prepend at core_ext/datePablo Herrero2015-05-045-89/+79
* | Force the uninstallRafael Mendonça França2015-05-281-1/+1
* | Uninstall bundler 1.10Rafael Mendonça França2015-05-281-0/+1
* | Use bundler < 1.10 until its bugs are fixedRafael Mendonça França2015-05-281-1/+1
* | Merge pull request #20351 from kddeisz/enumerable_pluckRafael Mendonça França2015-05-281-0/+10
|\ \
| * | Updating the guides for Enumerable#pluckKevin Deisz2015-05-281-0/+10
|/ /
* | Merge pull request #20341 from vngrs/remove_already_defined_methods_in_rack_r...Rafael Mendonça França2015-05-281-36/+0
|\ \
| * | Remove already defined methods in super class of ActionDispatch::Request classMehmet Emin İNAÇ2015-05-281-36/+0
* | | Merge pull request #20346 from repinel/remove-mocha2Rafael Mendonça França2015-05-284-59/+117
|\ \ \
| * | | Remove use of mocha from Active ModelRoque Pinel2015-05-284-59/+117
* | | | Merge pull request #20267 from kaspth/fix-minitest-constant-clashingRafael Mendonça França2015-05-288-43/+45
|\ \ \ \
| * | | | Avoid E constant clashing with Minitest defined version.Kasper Timm Hansen2015-05-228-43/+45
* | | | | Merge pull request #20350 from kddeisz/enumerable_pluckRafael Mendonça França2015-05-283-0/+20
|\ \ \ \ \