aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-06-1662-268/+511
|\
| * Merge pull request #29451 from vipulnsward/29441-flatten-defaultRafael França2017-06-142-1/+2
| |\
| | * Allow translate default option to accept an array similar to i18n.t. Fixes #2...Vipul A M2017-06-152-1/+2
| * | Use `require_relative` instead of `require` with full pathbogdanvlviv2017-06-141-1/+1
| |/
| * 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-047-20/+10
| |\
| | * Use mattr_accessor default: option throughout the projectGenadi Samokovarov2017-06-037-20/+10
| * | 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-024-9/+56
| * 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
| * | Add option for class_attribute default (#29270)David Heinemeier Hansson2017-05-299-22/+11
| * | Merge pull request #28132 from mikeycgto/aead-encrypted-cookiesKasper Timm Hansen2017-05-284-89/+181
| |\ \
| | * | AEAD encrypted cookies and sessionsMichael Coyne2017-05-224-89/+181
| * | | Merge pull request #28895 from codeforkjeff/fix-session-keys-and-values-methodsMatthew Draper2017-05-282-0/+20
| |\ \ \
| | * | | Add lazy loading to #keys and #values methods in Sessioncodeforkjeff2017-04-262-0/+20
| * | | | Merge pull request #29176 from bogdanvlviv/define-path-with__dir__Matthew Draper2017-05-2619-38/+38
| |\ \ \ \
| | * | | | Define path with __dir__bogdanvlviv2017-05-2319-38/+38
| * | | | | Merge pull request #28644 from mtsmfm/set-capybara-app-hostMatthew Draper2017-05-242-1/+18
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Set `Capybara.app_host` through `host!`Fumiaki MATSUSHIMA2017-04-022-1/+18
| * | | | | Remove unused simulate methodeileencodes2017-05-222-21/+21
| | |/ / / | |/| | |
| * | | | Merge pull request #29072 from dixpac/dixpac/add_documentation_for_validate_a...Robin Dupret2017-05-211-0/+20
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Improving docs for callbacks execution order [ci skip]dixpac2017-05-211-0/+20
| * | | | Merge pull request #29134 from joshaidan/document-action-nameAlex Kitchens2017-05-191-0/+8
| |\ \ \ \
| | * | | | Clarified description of formats [ci skip]Brian Jones2017-05-191-1/+1
| | * | | | Added missing punctuation [ci skip]Brian Jones2017-05-181-3/+3
| | * | | | Specify only the body of the response is returned [ci skip]Brian Jones2017-05-181-1/+1
| | * | | | Document accessors response_body, action_name, formats [ci skip]Brian Jones2017-05-171-0/+8
| * | | | | Cleanup CHANGELOGs [ci skip]Ryuta Kamizono2017-05-191-10/+10
| * | | | | Use recyclable cache keys (#29092)David Heinemeier Hansson2017-05-189-37/+96
| |/ / / /
* | | | | Merge branch 'master' into bug/filtered_parameters_classLeonel Galán2017-05-1713-26/+77
|\| | | |
| * | | | Fixed string being modified in place causing frozen string errors in Ruby 2.3sepehr5002017-05-152-2/+12
| * | | | Fix `TestInvalidUrls` with rack 2.0.3yuuji.yaginuma2017-05-161-6/+6
| |/ / /
| * | | Merge pull request #29062 from eileencodes/force-encoding-to-original-string-...Eileen M. Uchitelle2017-05-122-0/+7
| |\ \ \
| | * | | Maintain original encoding from patheileencodes2017-05-122-0/+7
| * | | | Pass block in ActionController::Parameters#deleteEugene Kenny2017-05-102-2/+23
| |/ / /
| * | | Should escape meta characters in regexpRyuta Kamizono2017-05-071-2/+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
| * | | Cleanup CHANGELOGs [ci skip]Ryuta Kamizono2017-04-301-0/+1
| * | | 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-2522-93/+316
|\| |
| * | Add test case to make sure we can implicit convert a Parameters to a HashRafael Mendonça França2017-04-201-0/+7