aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #18392 from brainopia/fix_route_requirementsArthur Nogueira Neves2015-04-271-1/+1
|\ \ \ | | | | | | | | Correct route requirements by overriding defaultls
| * | | Correct route requirements by overriding defaultls (fixes #18373)brainopia2015-01-081-1/+1
| | | |
* | | | 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
* | | | No need to capitalize verbs. [CI SKIP]Guo Xiang Tan2015-04-261-2/+2
| | | |
* | | | 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
| | | |
* | | | [ci skip] UpgradeLegacySignedCookieJar Doc fixSiddharth Bhatore2015-04-221-2/+2
|/ / /
* | | 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-143-0/+50
|\ \ \ | |/ / |/| | Set default form builder for a controller
| * | Override default form builder for a controllerKevin McPhillips2015-04-133-0/+50
| | |
* | | 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-122-6/+3
|/ / | | | | | | | | | | | | supercaracal/fix_force_ssl_redirection_flash_error" This reverts commit d215620340be7cb29e2aa87aab22da5ec9e6e6a7, reversing changes made to bbbbfe1ac02162ecb5e9a7b560134a3221f129f3.
* | [Rails4 regression] prevent thin and puma cause error in Non ASCII URL on ↵Toshi MARUYAMA2015-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | fix fails to force_ssl_redirection if session_store is disabledTaishi Kasuga2015-04-092-3/+6
| |
* | 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-082-2/+2
|\ \ \ | | | | | | | | avoid error when sort mixture keys in symbol and string
| * | | sort_by instead of sortYang Bo2015-04-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix method signature of `parse_query` to match rackeileencodes2015-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently rack was changed to have a second argument on the `parse_query` method (in rack/rack#781). Rails relies on this and it's `parse_query` method was complaining about missing the second argument. I changed the arguments to `*` so we don't have this issue in the future.
* | | | | head no_content when there is no template or action performedStephen Bussey2015-04-051-1/+6
|/ / / /
* / / / Fix a few typos [ci skip]Robin Dupret2015-04-051-3/+3
|/ / /
* | | Freeze static arguments for gsubbrainopia2015-04-022-3/+3
| | |
* | | Prefer string patterns for gsubbrainopia2015-04-022-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/ruby/ruby/pull/579 - there is a new optimization since ruby 2.2 Previously regexp patterns were faster (since a string was converted to regexp underneath anyway). But now string patterns are faster and better reflect the purpose. Benchmark.ips do |bm| bm.report('regexp') { 'this is ::a random string'.gsub(/::/, '/') } bm.report('string') { 'this is ::a random string'.gsub('::', '/') } bm.compare! end # string: 753724.4 i/s # regexp: 501443.1 i/s - 1.50x slower
* | | Merge pull request #19544 from shuhei/fix-parameters-const-missingXavier Noria2015-03-281-1/+1
|\ \ \ | | | | | | | | Return super in ActionController::Parameters.const_missing
| * | | Return super in ActionController::Parameters.const_missingShuhei Kagawa2015-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation of ActionController::Parameters.const_missing returns `ActionController::Parameters.always_permitted_parameters` even if its `super` returns a constant without raising error. This prevents its subclass in a autoloading module/class from taking advantage of autoloading constants. class SomeParameters < ActionController::Parameters def do_something DefinedSomewhere.do_something end end In the code above, `DefinedSomewhere` is to be autoloaded with `Module.const_missing` but `ActionController::Parameters.const_missing` returns `always_permitted_parameters` instead of the autoloaded constant. This pull request fixes the issue respecting `const_missing`'s `super`.
* | | | Add ActiveSupport::ArrayInquirer and Array#inquiryGeorge Claghorn2015-03-241-27/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrapping an array in an `ArrayInquirer` gives a friendlier way to check its string-like contents. For example, `request.variant` returns an `ArrayInquirer` object. To check a request's variants, you can call: request.variant.phone? request.variant.any?(:phone, :tablet) ...instead of: request.variant.include?(:phone) request.variant.any? { |v| v.in?([:phone, :tablet]) } `Array#inquiry` is a shortcut for wrapping the receiving array in an `ArrayInquirer`: pets = [:cat, :dog] pets.cat? # => true pets.ferret? # => false pets.any?(:cat, :ferret} # => true
* | | | Provide friendlier access to request variantsGeorge Claghorn2015-03-242-13/+41
|/ / / | | | | | | | | | Closes #18933.
* | | Fix ActionDispatch::PublicExceptions returning string rack statusRyan Tomayko2015-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The status returned in the rack [status, headers, body] array was a string, which can cause problems with middleware that assumes the status will be a Fixnum. This likely never surfaced because other middleware to_i the status returned from downstream apps before passing it on.
* | | Fix handling of empty X_FORWARDED_HOST header.adam2015-03-201-1/+1
| | | | | | | | | | | | | | | | | | Previously, an empty X_FORWARDED_HOST header would cause Actiondispatch::Http:URL.raw_host_with_port to return nil, causing Actiondispatch::Http:URL.host to raise a NoMethodError.
* | | Compare content_type with Mime::XML instead of regexpBoris Peterbarg2015-03-161-1/+1
| | | | | | | | | | | | | | | Regexp is broken for both content types including charsets and for integration tests, where the content_type is a Mime::Type and not String
* | | Merge pull request #19291 from hired/return-truthy-value-from-headRafael Mendonça França2015-03-131-0/+2
|\ \ \ | | | | | | | | Return truthy value from head method
| * | | Return true from head methodJoel Hayhurst2015-03-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | It was returning false in normal circumstances. This broke the `head :ok and return if` construct. Add appropriate test.
* | | | Merge pull request #19309 from f1sherman/dont-set-session-options-idGuillermo Iguaran2015-03-121-1/+1
|\ \ \ \ | | | | | | | | | | Use request.session.id instead of request.session_options[:id]
| * | | | Use request.session.id instead of request.session_options[:id]Brian John2015-03-121-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of the upgrade to Rack 1.5, request.session_options[:id] is no longer populated. Reflect this change in the tests by using request.session.id instead. Related change in Rack: https://github.com/rack/rack/commit/83a270d6