Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #28603 from mikeastock/alias-reverse-merge | Sean Griffin | 2017-03-29 | 2 | -0/+18 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Add aliases for reverse_merge to with_defaults | Matt Casper | 2017-03-29 | 2 | -0/+18 | |
* | | | | | Add test to make sure subclasses also get helpers | Rafael Mendonça França | 2017-03-29 | 1 | -0/+16 | |
|/ / / / | ||||||
* | | | | Make `driven_by` overridable | Fumiaki MATSUSHIMA | 2017-03-29 | 2 | -6/+13 | |
* | | | | Merge pull request #28514 from y-yagi/follow_up_to_28056 | Andrew White | 2017-03-28 | 1 | -8/+10 | |
|\ \ \ \ | ||||||
| * | | | | Fix store accessors in parameters test | yuuji.yaginuma | 2017-03-22 | 1 | -8/+10 | |
* | | | | | Make sure that ActionController::Api can include helpers | Rafael Mendonça França | 2017-03-27 | 1 | -0/+26 | |
* | | | | | Merge pull request #28528 from domcleal/parseerror-const-deprecation | Rafael França | 2017-03-22 | 1 | -1/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use DeprecatedConstantAccessor for AD::ParamsParser::ParseError | Dominic Cleal | 2017-03-22 | 1 | -1/+2 | |
* | | | | | | Small grammar fix | Jon Moss | 2017-03-22 | 1 | -1/+1 | |
* | | | | | | Small grammar fix | Jon Moss | 2017-03-22 | 1 | -2/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #28394 from shime/docs-action-dispatch | Xavier Noria | 2017-03-22 | 31 | -96/+96 | |
|\ \ \ \ \ | ||||||
| * | | | | | [docs] fix ActionDispatch documentation | Hrvoje Šimić | 2017-03-13 | 31 | -96/+96 | |
* | | | | | | Start Rails 5.2 development | Matthew Draper | 2017-03-22 | 2 | -410/+3 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #28056 from sngeth/wrap_store_accessors_in_params | Rafael França | 2017-03-21 | 2 | -1/+18 | |
|\ \ \ \ \ | ||||||
| * | | | | | Wrap store accessors in parameters | Sid Ngeth | 2017-03-21 | 2 | -1/+18 | |
* | | | | | | Fix test assertion | Rafael Mendonça França | 2017-03-21 | 1 | -1/+1 | |
* | | | | | | Fix test that was asserting the wrong thing | Rafael Mendonça França | 2017-03-21 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Revert "Merge pull request #27775 from domcleal/27774-format-reset" | Rafael Mendonça França | 2017-03-21 | 2 | -15/+5 | |
* | | | | | Always use original url_for when generating direct routes | Andrew White | 2017-03-17 | 2 | -1/+9 | |
* | | | | | Add support for calling nested direct routes (#28462) | Andrew White | 2017-03-17 | 4 | -32/+48 | |
* | | | | | Merge pull request #28341 from mtsmfm/pass-options-to-driven-by | Rafael França | 2017-03-17 | 3 | -4/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | Pass options to `driven_by` | Fumiaki MATSUSHIMA | 2017-03-13 | 3 | -4/+6 | |
* | | | | | | Bump Capybara and include Minitest::Assertions | eileencodes | 2017-03-17 | 1 | -0/+2 | |
* | | | | | | Cleanup documentation fixes (#28460) | Vipul A M | 2017-03-17 | 1 | -3/+3 | |
* | | | | | | Updates incorrect documentation [ci skip] | Dmitriy Budnik | 2017-03-16 | 1 | -4/+3 | |
* | | | | | | Remove unnecessary params munging | Andrew White | 2017-03-15 | 2 | -2/+62 | |
* | | | | | | Small grammar change | Jon Moss | 2017-03-13 | 1 | -3/+1 | |
* | | | | | | Fix Typo [ci skip] | Olivier | 2017-03-13 | 1 | -1/+1 | |
* | | | | | | Fix HTTPS grammar | Jon Moss | 2017-03-13 | 1 | -4/+4 | |
* | | | | | | Merge pull request #28381 from shime/docs-action-controller-base | Vipul A M | 2017-03-13 | 21 | -55/+55 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [docs] fix ActionController documentation | Hrvoje Šimić | 2017-03-12 | 21 | -55/+55 | |
* | | | | | | | Merge pull request #28185 from renchap/system-testing-screenshot-output | Eileen M. Uchitelle | 2017-03-13 | 1 | -5/+34 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Dont always display inline screenshots in system testing (#28133) | Renaud Chaput | 2017-03-11 | 1 | -5/+34 | |
| | |/ / / / | |/| | | | | ||||||
* / | | | | | Fixes ActionController::Rendering#with_defaults | alpaca-tc | 2017-03-12 | 3 | -1/+17 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #28378 from y-yagi/use_correct_variable_in_reverse_merge_test | Eileen M. Uchitelle | 2017-03-11 | 1 | -8/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use correct value in `reverse_merge` test | yuuji.yaginuma | 2017-03-11 | 1 | -8/+4 | |
* | | | | | | [docs] remove unnecessary sentence | Hrvoje Šimić | 2017-03-11 | 1 | -4/+3 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Fix indentation and formatting in CHANGELOGs [ci skip] | Ryuta Kamizono | 2017-03-11 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Add @takkanm credits in the changelog [ci skip] | Rafael Mendonça França | 2017-03-10 | 1 | -1/+1 | |
* | | | | Merge pull request #28355 from Edouard-chin/reversemerge-for-strongparameters | Rafael Mendonça França | 2017-03-10 | 3 | -0/+48 | |
|\ \ \ \ | ||||||
| * | | | | Added `reverse_merge`/`reverse_merge!` to AC::Parameters: | Edouard CHIN | 2017-03-09 | 3 | -0/+48 | |
* | | | | | Call system test driver per-instance rather than globally | eileencodes | 2017-03-09 | 7 | -42/+36 | |
* | | | | | Refactor system test driver/browser | eileencodes | 2017-03-09 | 6 | -56/+35 | |
|/ / / / | ||||||
* | | | | Tests for delegated public methods on AC::Parameters | T.J. Schuck | 2017-03-07 | 1 | -0/+63 | |
* | | | | params --> parameters | Jon Moss | 2017-03-07 | 1 | -2/+2 | |
* | | | | Document delegated public methods on AC::Parameters | T.J. Schuck | 2017-03-07 | 1 | -0/+71 | |
* | | | | Add CHANGELOG entry for #28250 | Andrew White | 2017-03-06 | 1 | -0/+10 | |
* | | | | Fix malformed asset_url when rendering template with ActionController::Renderer | Giorgos Vrettos | 2017-03-06 | 2 | -0/+15 | |
* | | | | Merge pull request #28301 from y-yagi/fix_direct_with_params_example | Jon Moss | 2017-03-05 | 1 | -1/+1 | |
|\ \ \ \ |