aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29533 from jdelStrother/missing_url_formatsRichard Schneeman2017-06-271-0/+2
|\
| * Fix missing formats in route-set URLsJonathan del Strother2017-06-231-0/+2
* | Calling `follow_redirect!` does not reset the `html_document`:Edouard CHIN2017-06-261-1/+1
* | Add an option to silence puma in system tests.Sam Phippen2017-06-241-1/+12
* | Removed reference to unexisting methods:Edouard CHIN2017-06-231-2/+1
|/
* Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-06-1617-65/+127
|\
| * Fix formatting of AD::FileHandler and AD::Static doc [ci skip]yuuji.yaginuma2017-06-131-7/+7
| * Merge pull request #29263 from assain/default_message_encryptor_to_gcmKasper Timm Hansen2017-06-111-1/+1
| |\
| | * set message_encryptor default cipher to aes-256-gcmAssain2017-06-121-1/+1
| * | Tiny documentation fixes [ci skip]Robin Dupret2017-06-061-3/+3
| |/
| * Merge pull request #29294 from gsamokovarov/attributes-defaultKasper Timm Hansen2017-06-046-16/+8
| |\
| | * Use mattr_accessor default: option throughout the projectGenadi Samokovarov2017-06-036-16/+8
| * | Fix typo on error message when route definition is ambiguous.André Luis Leal Cardoso Junior2017-06-031-1/+1
| * | [ci skip] Fix typo in the system tests docsPrathamesh Sonpatki2017-06-031-1/+1
| * | Fix formatting of `direct` and `resolve` doc [ci skip]yuuji.yaginuma2017-06-031-14/+14
| |/
| * SystemTesting::Driver can register capybara-webkit and poltergeistMario Alberto Chávez2017-06-022-7/+30
| * Merge pull request #29191 from bogdanvlviv/pass_params_filename_lineno_to_cla...Kasper Timm Hansen2017-05-291-5/+5
| |\
| | * Pass params __FILE__ and __LINE__ + 1 if class_eval with <<bogdanvlviv2017-05-291-5/+5
| * | Merge pull request #28132 from mikeycgto/aead-encrypted-cookiesKasper Timm Hansen2017-05-282-3/+51
| |\ \
| | * | AEAD encrypted cookies and sessionsMichael Coyne2017-05-222-3/+51
| * | | Merge pull request #28895 from codeforkjeff/fix-session-keys-and-values-methodsMatthew Draper2017-05-281-0/+2
| |\ \ \
| | * | | Add lazy loading to #keys and #values methods in Sessioncodeforkjeff2017-04-261-0/+2
| * | | | Merge pull request #29176 from bogdanvlviv/define-path-with__dir__Matthew Draper2017-05-262-2/+2
| |\ \ \ \
| | * | | | Define path with __dir__bogdanvlviv2017-05-232-2/+2
| | | |/ / | | |/| |
| * | | | Merge pull request #28644 from mtsmfm/set-capybara-app-hostMatthew Draper2017-05-241-1/+6
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Set `Capybara.app_host` through `host!`Fumiaki MATSUSHIMA2017-04-021-1/+6
| * | | | Remove unused simulate methodeileencodes2017-05-221-8/+0
| | |/ / | |/| |
* | | | Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-05-176-16/+34
|\| | |
| * | | Fixed string being modified in place causing frozen string errors in Ruby 2.3sepehr5002017-05-151-2/+6
| * | | Maintain original encoding from patheileencodes2017-05-121-0/+2
| * | | Remove `:doc:` in `:nodoc:` class [ci skip]Ryuta Kamizono2017-05-011-2/+2
| * | | Add periodJon Moss2017-04-301-1/+1
| * | | Add docs for Router::Utils.unescape_uri methoddixpac2017-04-301-0/+4
| * | | Do not try to encoding the parameters when the controller is not definedRafael Mendonça França2017-04-261-1/+7
| | |/ | |/|
| * | `respond_to_missing?` should be privateRyuta Kamizono2017-04-223-11/+13
* | | Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-04-254-25/+6
|\| |
| * | Reuse the Parameters#to_h check in the routing helpersRafael Mendonça França2017-04-183-24/+4
| * | Use more specific check for :format in route pathAndrew White2017-04-181-1/+2
| |/
* | Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-04-0335-106/+675
|\|
| * Make `driven_by` overridableFumiaki MATSUSHIMA2017-03-291-6/+5
| * Merge pull request #28528 from domcleal/parseerror-const-deprecationRafael França2017-03-221-1/+2
| |\
| | * Use DeprecatedConstantAccessor for AD::ParamsParser::ParseErrorDominic Cleal2017-03-221-1/+2
| * | Small grammar fixJon Moss2017-03-221-2/+1
| |/
| * Merge pull request #28394 from shime/docs-action-dispatchXavier Noria2017-03-2231-96/+96
| |\
| | * [docs] fix ActionDispatch documentationHrvoje Šimić2017-03-1331-96/+96
| * | Always use original url_for when generating direct routesAndrew White2017-03-172-1/+9
| * | Add support for calling nested direct routes (#28462)Andrew White2017-03-173-24/+20
| * | Merge pull request #28341 from mtsmfm/pass-options-to-driven-byRafael França2017-03-172-3/+4
| |\ \
| | * | Pass options to `driven_by`Fumiaki MATSUSHIMA2017-03-132-3/+4
| | |/
| * | Bump Capybara and include Minitest::Assertionseileencodes2017-03-171-0/+2