aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* `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
|\ \ \ \ \
| * | | | | Add Enumerable#pluck.Kevin Deisz2015-05-283-0/+20
| | |/ / / | |/| | |
* | | | | Merge pull request #20347 from repinel/fix-reflection-shadowingRafael Mendonça França2015-05-281-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix the shadowing warning for `reflection`Roque Pinel2015-05-281-2/+2
|/ / / /
* | | | Persist user provided default values, even if unchangedSean Griffin2015-05-284-27/+21
* | | | Allow proc defaults with the Attributes APISean Griffin2015-05-283-1/+36
* | | | Merge pull request #20017 from eliotsykes/configurable-static-index-filenameRafael Mendonça França2015-05-2812-8/+65
|\ \ \ \
| * | | | config.static_index configures directory index "index.html" filenameEliot Sykes2015-05-2812-8/+65
| | |/ / | |/| |
* | | | Merge pull request #20331 from arunagw/arunagw-remove-unused-package-tasksRafael Mendonça França2015-05-288-62/+2
|\ \ \ \
| * | | | Remove unused package tasksArun Agrawal2015-05-288-62/+2
| |/ / /
* | | | Merge pull request #20344 from jcockhren/fix_docs_presence_validationLauro Caetano2015-05-281-1/+0
|\ \ \ \
| * | | | removed erroneous line. Corrected presence validation example.Jurnell Cockhren2015-05-281-1/+0
|/ / / /
* | | | Merge pull request #20313 from s3ymd/masterArthur Nogueira Neves2015-05-281-1/+1
|\ \ \ \
| * | | | [ci skip] Fix block parameter of assert_no_differenceHiromichi Yamada2015-05-281-1/+1