aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Expand)AuthorAgeFilesLines
* normalize_path used to be nil tolerantAkira Matsuda2017-07-121-0/+1
* [Action Pack] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-1110-0/+10
* Merge pull request #29655 from kirs/frozen-friendly-ap-arMatthew Draper2017-07-109-10/+19
|\
| * Prepare AP and AR to be frozen string friendlyKir Shatrov2017-07-069-10/+19
* | Don't call register on custom driverseileencodes2017-07-081-3/+3
* | Allow mounting same engine under several locationsDavid Rodríguez2017-07-053-10/+20
|/
* Merge branch 'master' into require_relative_2017Xavier Noria2017-07-026-23/+42
|\
| * Merge pull request #29622 from yalab/warning_system_tesing_http_verbEileen M. Uchitelle2017-07-012-0/+26
| |\
| | * SystemTestCase undef some IntegrationTest methods because it's confused to use.yalab2017-07-012-0/+26
| * | Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-0276-76/+0
| * | Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-0276-0/+76
| |\ \
| | * | Enforce frozen string in RubocopKir Shatrov2017-07-0176-0/+76
| | |/
| * | Merge pull request #29506 from pat/frozen-string-literalsMatthew Draper2017-07-023-5/+5
| |\ \
| | * | Make ActionView frozen string literal friendly.Pat Allan2017-06-202-2/+2
| | * | Make ActionMailer frozen string literal friendly.Pat Allan2017-06-202-2/+2
| | * | Make ActiveModel frozen string literal friendly.Pat Allan2017-06-201-1/+1
| * | | Merge pull request #29644 from wilson/unify-route-helper-visibilityMatthew Draper2017-07-011-18/+11
| |\ \ \ | | |_|/ | |/| |
| | * | Properly register "custom" URL helpers as named helpers.Wilson Bilkovich2017-06-301-18/+10
| |/ /
* / / [Action Dispatch] require => require_relativeAkira Matsuda2017-07-0127-57/+57
|/ /
* | 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