aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Validate multiple contexts on `valid?` and `invalid?` at once.Dmitry Polushkin2015-07-305-2/+50
* Merge pull request #20887 from tgxworld/ar_callbacksRafael Mendonça França2015-07-158-23/+32
|\
| * Revert "Revert "Reduce allocations when running AR callbacks.""Guo Xiang Tan2015-07-168-23/+32
* | Merge pull request #20812 from aditya-kapoor/close-20694Robin Dupret2015-07-151-0/+16
|\ \
| * | [ci skip] add note for individual stub creationAditya Kapoor2015-07-151-0/+16
|/ /
* | Rack implements `redirect?` so we don't need itAaron Patterson2015-07-142-6/+0
* | Fix Gemfile.lockRafael Mendonça França2015-07-141-1/+0
* | Remove concurrent-ruby from Action Pack gemspecRafael Mendonça França2015-07-141-1/+0
* | Merge pull request #20866 from jdantonio/countdown-latchAaron Patterson2015-07-1411-58/+70
|\ \
| * | Replaced `ActiveSupport::Concurrency::Latch` with concurrent-ruby.Jerry D'Antonio2015-07-1311-58/+70
* | | Merge pull request #20877 from sikachu/rename-ac-test_responseRafael Mendonça França2015-07-144-4/+4
|\ \ \
| * | | Change AC::TestResponse to AD::TestResponsePrem Sichanugrist2015-07-144-4/+4
* | | | only call methods that are on the superclassAaron Patterson2015-07-143-7/+6
|/ / /
* | | Merge pull request #20870 from y-yagi/test_runner_inside_engineKasper Timm Hansen2015-07-144-7/+13
|\ \ \
| * | | make test runner work correctly inside engineyuuji.yaginuma2015-07-124-7/+13
* | | | use a lookup table for `assert_response`Aaron Patterson2015-07-132-5/+10
* | | | only have one TestResponse classAaron Patterson2015-07-132-5/+2
* | | | move buffer caching on to the bufferAaron Patterson2015-07-133-7/+15
* | | | Merge pull request #20736 from antoine-lizee/docsRobin Dupret2015-07-133-2/+7
|\ \ \ \
| * | | | [ci skip] doc: making clear that perform_caching has a limited impactantoine.lizee2015-07-133-2/+7
* | | | | Remove JRuby and Rubinius from the travis matrixRafael Mendonça França2015-07-131-4/+0
| |_|/ / |/| | |
* | | | Merge pull request #20852 from hedgesky/fix_typo_in_caching_guideKasper Timm Hansen2015-07-121-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | fix typo in caching guide [ci skip]Anton Chuchkalov2015-07-121-1/+1
|/ / /
* | | Merge pull request #20842 from TheBlasfem/removed_usage_lines_docsClaudio B.2015-07-112-2/+2
|\ \ \ | |_|/ |/| |
| * | added description instead of remove usage [ci skip]Julio Lopez2015-07-112-2/+2
* | | Merge branch 'json-gem-tests'Godfrey Chan2015-07-113-102/+186
|\ \ \
| * | | Expand coverage of JSON gem testsGodfrey Chan2015-07-111-16/+30
| * | | Expand the JSON test coverage for Struct and Hash (?!)Godfrey Chan2015-07-111-1/+13
| * | | Add tests to ensure we don't interfere with json gem's outputGodfrey Chan2015-07-113-102/+160
|/ / /
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-07-111-1/+1
|\ \ \
| * | | [ci skip] Fix hash key to symbolyui-knk2015-06-241-1/+1
* | | | Merge pull request #20847 from zamith/cleanup-am-testsAbdelkader Boudih2015-07-111-61/+2
|\ \ \ \
| * | | | Removes unnecessary comments from i18n validations tests [ci skip]Zamith2015-07-111-61/+2
|/ / / /
* | | | Merge pull request #20845 from y-yagi/fix_typo_in_changelogKasper Timm Hansen2015-07-111-1/+1
|\ \ \ \
| * | | | fix class name typo [ci skip]yuuji.yaginuma2015-07-111-1/+1
|/ / / /
* | | | Merge pull request #20832 from mcfiredrill/contributing-to-rails-bugs-arent-f...Xavier Noria2015-07-111-1/+1
|\ \ \ \
| * | | | the key is that the behavior is incorrect [ci skip]Tony Miller2015-07-111-1/+1
| * | | | saying that "behaviour" "behaves" is kind of awkward, how about "works"Tony Miller2015-07-101-1/+1
| * | | | [ci skip] change sentence about reporting bugs in contributing guideTony Miller2015-07-101-1/+1
| | |/ / | |/| |
* | | | Merge pull request #20838 from TheBlasfem/improve_duplicable_documentationKasper Timm Hansen2015-07-111-1/+5
|\ \ \ \
| * | | | improve duplicable documentation [ci skip]Julio Lopez2015-07-101-1/+5
| |/ / /
* | | | Merge pull request #20843 from zamith/activemodel-remove-mochaClaudio B.2015-07-101-27/+27
|\ \ \ \
| * | | | Remove the reference to mocha in activemodelZamith2015-07-111-27/+27
|/ / / /
* | | | remove Rack::Lock for webrickAaron Patterson2015-07-101-11/+1
* | | | Require yaml for XML mini isolation test.Kasper Timm Hansen2015-07-111-0/+1
* | | | Merge pull request #17102 from matthewd/load-interlockAaron Patterson2015-07-108-53/+315
|\ \ \ \
| * | | | Document ShareLock and the InterlockMatthew Draper2015-07-093-9/+42
| * | | | Fix the Interlock middlewareMatthew Draper2015-07-091-5/+14
| * | | | Rely on the load interlock for non-caching reloads, tooMatthew Draper2015-07-094-24/+28
| * | | | Soften the lock requirements when eager_load is disabledMatthew Draper2015-07-097-47/+263