aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Updated request_forgery_protection docs [ci skip]Prathamesh Sonpatki2015-04-281-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed Javascript to JavaScript. - Added full-stop which was missing, also wrapped the sentence to 80 chars. - Changed proc to Proc and oauth to OAuth.
* | | | | Add changelog for rake routes default fixArthur Neves2015-04-271-0/+7
| | | | | | | | | | | | | | | | | | | | [see #18392]
* | | | | Merge pull request #18392 from brainopia/fix_route_requirementsArthur Nogueira Neves2015-04-272-1/+9
|\ \ \ \ \ | | | | | | | | | | | | Correct route requirements by overriding defaultls
| * | | | | Correct route requirements by overriding defaultls (fixes #18373)brainopia2015-01-082-1/+9
| | | | | |
* | | | | | Merge pull request #19904 from zzak/rm_route_wrapper_internal_hacksRafael Mendonça França2015-04-261-0/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rm route wrapper internal hacks
| * | | | | | Remove internal hacks dependent on Sprockets from RouteWrapperZachary Scott2015-04-251-5/+1
| | | | | | |
| * | | | | | Fix rake routes for api appsJorge Bejar2015-04-252-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | | | | | Don't reference sprockets assets on action packArthur Neves2015-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to ignore the `assets_prefix` when running a command like `rake routes`. However we cannot reference asserts_prefix from action_pack as that is a sprockets-rails concern. See this is now implemented on sprockets-rails https://github.com/rails/sprockets-rails/commit/85b89c44ad40af3056899808475e6e4bf65c1f5a
* | | | | | | Removed unused code from request_forgery_protection testsPrathamesh Sonpatki2015-04-261-17/+0
|/ / / / / /
* | | | | | No need to capitalize verbs. [CI SKIP]Guo Xiang Tan2015-04-261-2/+2
| | | | | |
* | | | | | Why do we add a top-level constant here?Akira Matsuda2015-04-251-5/+3
| | | | | |
* | | | | | Merge pull request #19879 from bboe/RedirectTestCleanupRafael Mendonça França2015-04-231-3/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused WorkshopsController class in redirect_test.
| * | | | | | Remove unused WorkshopsController class in redirect_test.Bryce Boe2015-04-231-3/+0
| | | | | | |
* | | | | | | Add nodoc to some private constants [ci skip]Rafael Mendonça França2015-04-231-3/+3
| | | | | | |
* | | | | | | Merge pull request #19823 from sbhatore/doc_fix_1Rafael Mendonça França2015-04-231-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [ci skip] Description inside Signed and Encrypted CookieJars added
| * | | | | | Squashed commit of the following:Siddharth Bhatore2015-04-231-0/+8
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit a88875ac6abaa4d8116b42af8cd71189ce3d44d3 Author: Siddharth Bhatore <sbhatore95@gmail.com> Date: Thu Apr 23 12:26:08 2015 +0530 [ci skip] Update doc fix cookies commit f175eaa7a21db898fc6c66334f770831028f9d00 Author: Siddharth Bhatore <sbhatore95@gmail.com> Date: Mon Apr 20 12:58:04 2015 +0530 Description inside Signed and Encrypted CookieJars added
* | | | | | [ci skip] Add, clean up docs in ActionDispatch ActionDispatch middlewareNick Cox2015-04-221-6/+13
| | | | | |
* | | | | | Merge pull request #19852 from sbhatore/doc_fix_cookiesSantiago Pastorino2015-04-221-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] UpgradeLegacySignedCookieJar Doc fix
| * | | | | | [ci skip] UpgradeLegacySignedCookieJar Doc fixSiddharth Bhatore2015-04-221-2/+2
| |/ / / / /
* / / / / / pass over CHANGELOGs. [ci skip]Yves Senn2015-04-221-4/+4
|/ / / / /
* | | / / Add missing require for String#strip_heredocPrem Sichanugrist2015-04-171-0/+1
| |_|/ / |/| | | | | | | | | | | | | | | | | | | This method is being used in `#xml_http_request`, but was not properly required. This causes `NoMethodError` on projects that are doing integration test.
* | | | remove extra `=` in form builder example [ci skip]yuuji.yaginuma2015-04-151-1/+1
| | | |
* | | | Merge pull request #19757 from Strech/http-auth-realm-unquotingArthur Nogueira Neves2015-04-141-2/+2
|\ \ \ \ | | | | | | | | | | Tiny optimization of http auth Realm unquoting
| * | | | Tiny optimization of http auth Realm unquotingStrech (Sergey Fedorov)2015-04-141-2/+2
| | | | |
* | | | | Fix typos in the documentation [ci skip]Rafael Mendonça França2015-04-141-1/+1
| | | | |
* | | | | Merge pull request #19736 from kmcphillips/masterRafael Mendonça França2015-04-145-0/+75
|\ \ \ \ \ | |/ / / / |/| | | | Set default form builder for a controller
| * | | | Override default form builder for a controllerKevin McPhillips2015-04-135-0/+75
| | | | |
* | | | | Use `silence_warnings` on `StaticTests`eileencodes2015-04-141-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When 7e504927 was merged setting `Encoding.default_internal` and `Encoding.default_external` would throw a warning when the ActionPack tests were run. Example warning: `actionpack/test/dispatch/static_test.rb:12: warning: setting Encoding.default_external` This patch silences the warnings as other similar tests do for setting default_internal and default_external.
* | | | | Merge pull request #19753 from jonatack/use-ruby-2-2-2Guillermo Iguaran2015-04-131-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Upgrade to Ruby 2.2.2
| * | | | Upgrade to Ruby 2.2.2Jon Atack2015-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | and fix the grammar in the ruby_version_check.rb user message.
* | | | | Add note regarding CSRF for APIs, as a use-case for skipping it [ci skip]Zachary Scott2015-04-121-0/+4
| | | | |
* | | | | Apply comments from @jeremy regarding why HTML and Javascript requestsZachary Scott2015-04-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specifically are checked for CSRF, when dealing with the browser. [ci skip]
* | | | | update request_forgery_protection docs [ci skip]Vladimir Lyzo2015-04-121-7/+8
| | | | |
* | | | | Revert "Merge pull request #19682 from ↵Santiago Pastorino2015-04-123-31/+3
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | supercaracal/fix_force_ssl_redirection_flash_error" This reverts commit d215620340be7cb29e2aa87aab22da5ec9e6e6a7, reversing changes made to bbbbfe1ac02162ecb5e9a7b560134a3221f129f3.
* | | | fix a wrong feature test method nameTaishi Kasuga2015-04-111-1/+1
| | | |
* | | | [Rails4 regression] prevent thin and puma cause error in Non ASCII URL on ↵Toshi MARUYAMA2015-04-092-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows * https://github.com/rails/rails/issues/19187 * https://github.com/rails/rails/pull/19533 * https://github.com/macournoyer/thin/issues/268 These are serious Rails 4 regression for Redmine Bitnami Windows users. https://community.bitnami.com/t/problems-with-3-0-1-installation-see-report-inside/30195/ It is not caused on webrick users. Related: * https://github.com/rack/rack/issues/732#issuecomment-67677272 * https://github.com/phusion/passenger/issues/1328
* | | | wrap "require 'drb/unix'" by bgin-end at test/abstract_unit.rbToshi MARUYAMA2015-04-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Related: #19617, #19187, #19533, #19689, #19675. 'drb/unix' does not exist on mingw.
* | | | fix fails to force_ssl_redirection if session_store is disabledTaishi Kasuga2015-04-093-3/+31
| | | |
* | | | Merge pull request #19700 from tancnle/trivial-shallow-nesting-depth-countRafael Mendonça França2015-04-081-1/+1
|\ \ \ \ | | | | | | | | | | A shorter and more concise version of select..size
| * | | | A shorter and more concise version of select..sizeTan Le2015-04-091-1/+1
| | | | |
* | | | | Merge pull request #19633 from y00rb/sort_router_parameters_duplicated_keysRafael Mendonça França2015-04-084-2/+42
|\ \ \ \ \ | | | | | | | | | | | | avoid error when sort mixture keys in symbol and string
| * | | | | sort_by instead of sortYang Bo2015-04-084-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is avoid sort errot within different and mixed keys. used `sort_by` + `block` to list parameter by keys. keep minimum changes
* | | | | | remove new line between doc and methodBruce Park2015-04-071-1/+0
| | | | | |
* | | | | | added docs for ActionDispatch::Request::Session#createBruce Park2015-04-071-1/+3
| | | | | |
* | | | | | Merge pull request #19029 from iainbeeston/skipping-undefined-callbacksRafael Mendonça França2015-04-061-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Raise ArgumentError if an unrecognised callback is skipped
| * | | | | | Raise ArgumentError if an unrecognised callback is skippedIain Beeston2015-04-031-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present, if you skip a callback that hasn't been defined, activesupport callbacks silently does nothing. However, it's easy to mistype the name of a callback and mistakenly think that it's being skipped, when it is not. This problem even exists in the current test suite. CallbacksTest::SkipCallbacksTest#test_skip_person attempts to skip callbacks that were never set up. This PR changes `skip_callback` to raise an `ArgumentError` if the specified callback cannot be found.
* | | | | | Merge pull request #19666 from mikej/masterSantiago Pastorino2015-04-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix missing "if" in API docs for ActionController::Parameters#permit
| * | | | | | fix missing "if" in API docs for ActionController::Parameters#permitMichael Josephson2015-04-061-1/+1
| | | | | | |
* | | | | | | Fix ActionPack tests after changes to missing template loggereileencodes2015-04-062-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After merging #19377 ActionPack tests were missing a require for `ActiveSupport::LogSubscriber::TestHelper` and change didn't take into account that logger could be nil. Added the require and only log to info if logger exists. This wasn't caught earlier because these tests only run after a merge.
* | | | | | | Merge pull request #19665 from eileencodes/fix-parse_query-method-signatureEileen M. Uchitelle2015-04-061-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix method signature of `parse_query` to match rack