Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #20125 | Sean Griffin | 2015-07-17 | 3 | -0/+19 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | ActiveSupport::HashWithIndifferentAccess select and reject should return enum... | Bernard Potocki | 2015-07-17 | 3 | -0/+19 | |
|/ / / / / / / | ||||||
* | | | | | | | remove useless conditionals | Aaron Patterson | 2015-07-17 | 1 | -2/+2 | |
* | | | | | | | remove useless function | Aaron Patterson | 2015-07-17 | 1 | -8/+2 | |
* | | | | | | | stop passing `params` to `array_of_permitted_scalars_filter` | Aaron Patterson | 2015-07-17 | 1 | -4/+6 | |
* | | | | | | | push key checking up | Aaron Patterson | 2015-07-17 | 1 | -1/+2 | |
* | | | | | | | Merge pull request #20918 from jonatack/fix-lookup-grammar | Rafael Mendonça França | 2015-07-17 | 7 | -14/+17 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | [skip ci] Lookup can be a noun but it is not a verb | Jon Atack | 2015-07-17 | 7 | -14/+17 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #20915 from robin850/jruby-skips | Sean Griffin | 2015-07-17 | 3 | -0/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Skip a few failing tests on JRuby with the attached tickets | Robin Dupret | 2015-07-17 | 3 | -0/+8 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #20909 from yui-knk/fix/test-commnad | Claudio B. | 2015-07-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [ci skip] Add `bundle exec` to test run command | yui-knk | 2015-07-17 | 1 | -1/+1 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #20905 from imtayadeway/tw/fix-db-pooling-docs | Claudio B. | 2015-07-17 | 1 | -7/+7 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [skip ci] Improve grammar/style in DB pooling guide. | Tim Wade | 2015-07-16 | 1 | -7/+7 | |
| |/ / / / / | ||||||
* | | | | | | Oops! :bomb: | Akira Matsuda | 2015-07-17 | 1 | -1/+1 | |
* | | | | | | "warning: instance variable @routes not initialized" | Akira Matsuda | 2015-07-17 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #20892 from zoltankiss/make-params-method-returns-consistent | Rafael Mendonça França | 2015-07-15 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Standardize `ActionController::Parameters#to_unsafe_h` return value | Zoltan Kiss | 2015-07-15 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #20888 from sikachu/remove-support-for-force-reload | Rafael Mendonça França | 2015-07-15 | 9 | -0/+70 | |
|\ \ \ \ | ||||||
| * | | | | Deprecate force association reload by passing true | Prem Sichanugrist | 2015-07-15 | 9 | -0/+70 | |
* | | | | | Merge pull request #20868 from sikachu/params-not-inherited-from-hwia | Rafael Mendonça França | 2015-07-15 | 10 | -38/+167 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Update documentation on `AC::Parameters` | Prem Sichanugrist | 2015-07-15 | 2 | -7/+33 | |
| * | | | | Make AC::Parameters not inherited from Hash | Prem Sichanugrist | 2015-07-15 | 10 | -35/+138 | |
* | | | | | Merge pull request #20887 from tgxworld/ar_callbacks | Rafael Mendonça França | 2015-07-15 | 8 | -23/+32 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Revert "Revert "Reduce allocations when running AR callbacks."" | Guo Xiang Tan | 2015-07-16 | 8 | -23/+32 | |
* | | | | | Merge pull request #20812 from aditya-kapoor/close-20694 | Robin Dupret | 2015-07-15 | 1 | -0/+16 | |
|\ \ \ \ \ | ||||||
| * | | | | | [ci skip] add note for individual stub creation | Aditya Kapoor | 2015-07-15 | 1 | -0/+16 | |
|/ / / / / | ||||||
* | | | | | Rack implements `redirect?` so we don't need it | Aaron Patterson | 2015-07-14 | 2 | -6/+0 | |
* | | | | | Fix Gemfile.lock | Rafael Mendonça França | 2015-07-14 | 1 | -1/+0 | |
* | | | | | Remove concurrent-ruby from Action Pack gemspec | Rafael Mendonça França | 2015-07-14 | 1 | -1/+0 | |
* | | | | | Merge pull request #20866 from jdantonio/countdown-latch | Aaron Patterson | 2015-07-14 | 11 | -58/+70 | |
|\ \ \ \ \ | ||||||
| * | | | | | Replaced `ActiveSupport::Concurrency::Latch` with concurrent-ruby. | Jerry D'Antonio | 2015-07-13 | 11 | -58/+70 | |
* | | | | | | Merge pull request #20877 from sikachu/rename-ac-test_response | Rafael Mendonça França | 2015-07-14 | 4 | -4/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Change AC::TestResponse to AD::TestResponse | Prem Sichanugrist | 2015-07-14 | 4 | -4/+4 | |
* | | | | | | | only call methods that are on the superclass | Aaron Patterson | 2015-07-14 | 3 | -7/+6 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #20870 from y-yagi/test_runner_inside_engine | Kasper Timm Hansen | 2015-07-14 | 4 | -7/+13 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | make test runner work correctly inside engine | yuuji.yaginuma | 2015-07-12 | 4 | -7/+13 | |
* | | | | | | | use a lookup table for `assert_response` | Aaron Patterson | 2015-07-13 | 2 | -5/+10 | |
* | | | | | | | only have one TestResponse class | Aaron Patterson | 2015-07-13 | 2 | -5/+2 | |
* | | | | | | | move buffer caching on to the buffer | Aaron Patterson | 2015-07-13 | 3 | -7/+15 | |
* | | | | | | | Merge pull request #20736 from antoine-lizee/docs | Robin Dupret | 2015-07-13 | 3 | -2/+7 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [ci skip] doc: making clear that perform_caching has a limited impact | antoine.lizee | 2015-07-13 | 3 | -2/+7 | |
* | | | | | | | | Remove JRuby and Rubinius from the travis matrix | Rafael Mendonça França | 2015-07-13 | 1 | -4/+0 | |
| |_|/ / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #20852 from hedgesky/fix_typo_in_caching_guide | Kasper Timm Hansen | 2015-07-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | fix typo in caching guide [ci skip] | Anton Chuchkalov | 2015-07-12 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #20842 from TheBlasfem/removed_usage_lines_docs | Claudio B. | 2015-07-11 | 2 | -2/+2 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | added description instead of remove usage [ci skip] | Julio Lopez | 2015-07-11 | 2 | -2/+2 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge branch 'json-gem-tests' | Godfrey Chan | 2015-07-11 | 3 | -102/+186 | |
|\ \ \ \ \ | ||||||
| * | | | | | Expand coverage of JSON gem tests | Godfrey Chan | 2015-07-11 | 1 | -16/+30 | |
| * | | | | | Expand the JSON test coverage for Struct and Hash (?!) | Godfrey Chan | 2015-07-11 | 1 | -1/+13 |