aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove extraneous `then` from case statementPeter Boling2015-07-172-14/+39
* Improve sql logging coloration in `ActiveRecord::LogSubscriber`.Peter Boling2015-07-174-8/+144
* Merge pull request #20915 from robin850/jruby-skipsSean Griffin2015-07-173-0/+8
|\
| * Skip a few failing tests on JRuby with the attached ticketsRobin Dupret2015-07-173-0/+8
|/
* Merge pull request #20909 from yui-knk/fix/test-commnadClaudio B.2015-07-171-1/+1
|\
| * [ci skip] Add `bundle exec` to test run commandyui-knk2015-07-171-1/+1
* | Merge pull request #20905 from imtayadeway/tw/fix-db-pooling-docsClaudio B.2015-07-171-7/+7
|\ \
| * | [skip ci] Improve grammar/style in DB pooling guide.Tim Wade2015-07-161-7/+7
| |/
* | Oops! :bomb:Akira Matsuda2015-07-171-1/+1
* | "warning: instance variable @routes not initialized"Akira Matsuda2015-07-171-1/+1
|/
* Merge pull request #20892 from zoltankiss/make-params-method-returns-consistentRafael Mendonça França2015-07-151-1/+1
|\
| * Standardize `ActionController::Parameters#to_unsafe_h` return valueZoltan Kiss2015-07-151-1/+1
|/
* Merge pull request #20888 from sikachu/remove-support-for-force-reloadRafael Mendonça França2015-07-159-0/+70
|\
| * Deprecate force association reload by passing truePrem Sichanugrist2015-07-159-0/+70
* | Merge pull request #20868 from sikachu/params-not-inherited-from-hwiaRafael Mendonça França2015-07-1510-38/+167
|\ \ | |/ |/|
| * Update documentation on `AC::Parameters`Prem Sichanugrist2015-07-152-7/+33
| * Make AC::Parameters not inherited from HashPrem Sichanugrist2015-07-1510-35/+138
* | 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
|\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-24 21:38:53 +0000