aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #26329 from riseshia/patch-1Jon Moss2016-08-301-12/+7
|\
| * Update typo & Make explanation more clearShia2016-08-311-12/+7
|/
* Merge pull request #25880 from ryandv/fix_performance_regression_in_timewithz...Andrew White2016-08-301-1/+1
|\
| * Memoize coerced TimeWithZone value in TimeWithZone#localtime.Ryan De Villa2016-08-231-7/+1
| * Fix performance regression in `TimeWithZone#to_time`Ryan De Villa2016-08-231-0/+6
* | Merge pull request #26317 from maclover7/jm-fix-26298Aaron Patterson2016-08-293-8/+30
|\ \
| * | Remove default argument, and extract internal convenience methodJon Moss2016-08-291-6/+12
| * | Add regression testsJon Moss2016-08-291-0/+14
| * | Allow `send_file` to declare a charsetJon Moss2016-08-292-4/+6
* | | Merge pull request #26318 from alexcameron89/contributing-doc-updateAndrew White2016-08-291-1/+1
|\ \ \
| * | | [ci skip] Update branch version in Contributing GuideAlex Kitchens2016-08-291-1/+1
|/ / /
* / / Fix nested multiple rootsRyo Hashimoto2016-08-293-2/+61
|/ /
* | Remove unneeded FIXME noteRafael Mendonça França2016-08-291-2/+0
* | Merge pull request #26311 from y-yagi/use_inspect_for_show_valueKasper Timm Hansen2016-08-292-1/+10
|\ \
| * | use `inspect` for show `from` valueyuuji.yaginuma2016-08-292-1/+10
* | | Merge pull request #26310 from kjellberg/guidesJon Moss2016-08-281-0/+1
|\ \ \ | |/ / |/| |
| * | Added gitignore to "files & purpose" list [ci skip]Rasmus Kjellberg2016-08-291-0/+1
|/ /
* | Merge pull request #26305 from kamipo/follow-up-to-26301Kasper Timm Hansen2016-08-281-3/+1
|\ \
| * | Switch back to `Hash.dup`Ryuta Kamizono2016-08-281-3/+1
* | | Merge pull request #26306 from kamipo/remove_under_ruby-1.9Kasper Timm Hansen2016-08-281-9/+9
|\ \ \ | |/ / |/| |
| * | Remove "Under Ruby 1.9" [ci skip]Ryuta Kamizono2016-08-281-9/+9
|/ /
* | validate_each in NumericalityValidator is never called in this case.Guillermo Iguaran2016-08-281-2/+0
* | Add test for allow_blank in numericality validationNicolai Reuschling2016-08-281-0/+7
* | Merge pull request #26301 from maclover7/jm-fix-commentGuillermo Iguaran2016-08-271-4/+2
|\ \
| * | Switch back to `Hash.dup`Jon Moss2016-08-271-4/+2
|/ /
* | Merge pull request #26299 from davydovanton/fix-typoVipul A M2016-08-271-1/+1
|\ \
| * | Fix typo in Delegation#delegate_missing_to doc [skip ci]Anton Davydov2016-08-271-1/+1
|/ /
* | Merge pull request #26297 from ledermann/patch-1Vijay Dev2016-08-271-1/+1
|\ \
| * | Fix typo in deprecation messageGeorg Ledermann2016-08-271-1/+1
|/ /
* | Merge pull request #26293 from mechanicles/move-custom-assertionGuillermo Iguaran2016-08-272-11/+11
|\ \
| * | Move custom assertion to its proper placeSantosh Wadghule2016-08-272-11/+11
|/ /
* | Missing key should throw KeyErroreileencodes2016-08-262-1/+7
* | Merge pull request #26288 from maclover7/jm-revert-21995Guillermo Iguaran2016-08-261-7/+11
|\ \
| * | Clarify two ways to set Rails configuration optionsJon Moss2016-08-261-5/+8
| * | Add back in `config_for` exampleJon Moss2016-08-261-0/+28
| * | Revert "Merge pull request #21995 from tak1n/master"Jon Moss2016-08-261-35/+8
* | | Merge pull request #26287 from mechanicles/rails-assertionJon Moss2016-08-261-1/+1
|\ \ \ | |/ / |/| |
| * | Move `assert_nothing_raised` method to Rails Specific AssertionsSantosh Wadghule2016-08-261-1/+1
|/ /
* | Merge pull request #26284 from kamipo/fix_warnigGuillermo Iguaran2016-08-251-1/+1
|\ \
| * | Fix "warning: assigned but unused variable - task"Ryuta Kamizono2016-08-261-1/+1
|/ /
* | Fix typo in the hook nameRafael Mendonça França2016-08-251-1/+1
* | Add load hooks to all tests classesRafael Mendonça França2016-08-254-0/+5
* | kick different instrumentation methodAaron Patterson2016-08-241-8/+12
* | remove useless freezeAaron Patterson2016-08-241-1/+1
* | Simplify cache hit loggingAaron Patterson2016-08-242-5/+5
* | Merge pull request #26271 from jcoleman/fix-unnecessary-query-cache-busting-testGuillermo Iguaran2016-08-241-0/+20
|\ \
| * | Test that AR query cache isn't busted when types are not same objectJames Coleman2016-08-241-0/+20
* | | Merge pull request #26235 from samphippen/allow-early-setting-of-integration-...Sean Griffin2016-08-242-1/+23
|\ \ \ | |/ / |/| |
| * | Move setting of integration session to constructor.Sam Phippen2016-08-211-1/+5
| * | Allow the `integration_sesion` to be set early on ActionDispatch::Integration...Sam Phippen2016-08-202-1/+19