| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #28132 from mikeycgto/aead-encrypted-cookies | Kasper Timm Hansen | 2017-05-28 | 1 | -86/+120 |
|\ |
|
| * | AEAD encrypted cookies and sessions | Michael Coyne | 2017-05-22 | 1 | -86/+120 |
* | | Merge pull request #28895 from codeforkjeff/fix-session-keys-and-values-methods | Matthew Draper | 2017-05-28 | 1 | -0/+18 |
|\ \ |
|
| * | | Add lazy loading to #keys and #values methods in Session | codeforkjeff | 2017-04-26 | 1 | -0/+18 |
* | | | Merge pull request #29176 from bogdanvlviv/define-path-with__dir__ | Matthew Draper | 2017-05-26 | 15 | -34/+34 |
|\ \ \ |
|
| * | | | Define path with __dir__ | bogdanvlviv | 2017-05-23 | 15 | -34/+34 |
| | |/
| |/| |
|
* | | | Merge pull request #28644 from mtsmfm/set-capybara-app-host | Matthew Draper | 2017-05-24 | 1 | -0/+12 |
|\ \ \ |
|
| * | | | Set `Capybara.app_host` through `host!` | Fumiaki MATSUSHIMA | 2017-04-02 | 1 | -0/+12 |
* | | | | Remove unused simulate method | eileencodes | 2017-05-22 | 1 | -13/+21 |
| |/ /
|/| | |
|
* | | | Use recyclable cache keys (#29092) | David Heinemeier Hansson | 2017-05-18 | 6 | -28/+53 |
* | | | Fixed string being modified in place causing frozen string errors in Ruby 2.3 | sepehr500 | 2017-05-15 | 1 | -0/+6 |
* | | | Fix `TestInvalidUrls` with rack 2.0.3 | yuuji.yaginuma | 2017-05-16 | 1 | -6/+6 |
* | | | Merge pull request #29062 from eileencodes/force-encoding-to-original-string-... | Eileen M. Uchitelle | 2017-05-12 | 1 | -0/+5 |
|\ \ \ |
|
| * | | | Maintain original encoding from path | eileencodes | 2017-05-12 | 1 | -0/+5 |
* | | | | Pass block in ActionController::Parameters#delete | Eugene Kenny | 2017-05-10 | 1 | -0/+21 |
|/ / / |
|
* | / | Should escape meta characters in regexp | Ryuta Kamizono | 2017-05-07 | 1 | -2/+2 |
| |/
|/| |
|
* | | Add test case to make sure we can implicit convert a Parameters to a Hash | Rafael Mendonça França | 2017-04-20 | 1 | -0/+7 |
* | | Fix all style guides violations | Rafael Mendonça França | 2017-04-19 | 6 | -6/+6 |
* | | Reuse the Parameters#to_h check in the routing helpers | Rafael Mendonça França | 2017-04-18 | 4 | -8/+8 |
* | | Implement ActionController::Parameters#to_query and #to_param | Rafael Mendonça França | 2017-04-18 | 1 | -3/+21 |
* | | Use the right assetions to better error messages | Rafael Mendonça França | 2017-04-18 | 1 | -7/+7 |
* | | Add test to make sure that to_unsafe_h don't mutate the target | Rafael Mendonça França | 2017-04-18 | 1 | -0/+10 |
* | | Add ActionController::Parameters#to_hash to implict conversion | Rafael Mendonça França | 2017-04-18 | 1 | -0/+26 |
* | | Raise exception when calling to_h in a unfiltered Parameters | Rafael Mendonça França | 2017-04-18 | 1 | -15/+4 |
* | | Test the correct object | Rafael Mendonça França | 2017-04-18 | 1 | -1/+1 |
* | | Use more specific check for :format in route path | Andrew White | 2017-04-18 | 1 | -0/+18 |
* | | Default embed_authenticity_token_in_remote_forms to nil. | Kasper Timm Hansen | 2017-04-16 | 1 | -0/+90 |
* | | Improve logging when Origin header doesn't match | Jon Leighton | 2017-04-06 | 1 | -0/+11 |
|/ |
|
* | Merge pull request #28606 from maclover7/jm-fix-25820 | Andrew White | 2017-03-30 | 2 | -0/+57 |
|\ |
|
| * | Do not include default response headers for AC::Metal | Jon Moss | 2017-03-29 | 2 | -0/+57 |
* | | Merge pull request #28603 from mikeastock/alias-reverse-merge | Sean Griffin | 2017-03-29 | 1 | -0/+16 |
|\ \
| |/
|/| |
|
| * | Add aliases for reverse_merge to with_defaults | Matt Casper | 2017-03-29 | 1 | -0/+16 |
* | | 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 | 1 | -0/+8 |
* | 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 #28056 from sngeth/wrap_store_accessors_in_params | Rafael França | 2017-03-21 | 1 | -0/+13 |
|\ |
|
| * | Wrap store accessors in parameters | Sid Ngeth | 2017-03-21 | 1 | -0/+13 |
* | | 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 | 1 | -14/+5 |
* | Add support for calling nested direct routes (#28462) | Andrew White | 2017-03-17 | 1 | -8/+28 |
* | Merge pull request #28341 from mtsmfm/pass-options-to-driven-by | Rafael França | 2017-03-17 | 1 | -1/+2 |
|\ |
|
| * | Pass options to `driven_by` | Fumiaki MATSUSHIMA | 2017-03-13 | 1 | -1/+2 |
* | | Remove unnecessary params munging | Andrew White | 2017-03-15 | 1 | -0/+61 |
|/ |
|
* | Fixes ActionController::Rendering#with_defaults | alpaca-tc | 2017-03-12 | 1 | -0/+10 |
* | Use correct value in `reverse_merge` test | yuuji.yaginuma | 2017-03-11 | 1 | -8/+4 |
* | Merge pull request #28355 from Edouard-chin/reversemerge-for-strongparameters | Rafael Mendonça França | 2017-03-10 | 1 | -0/+29 |
|\ |
|
| * | Added `reverse_merge`/`reverse_merge!` to AC::Parameters: | Edouard CHIN | 2017-03-09 | 1 | -0/+29 |