aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-ip-spoof-errors' of https://github.com/tamird/rails into ↵Andrew White2013-09-301-1/+1
|\ | | | | | | tamird-fix-ip-spoof-errors
| * make sure both headers are set before checking for ip spoofingTamir Duberstein2013-06-041-1/+1
| |
* | Merge pull request #12398 from thedarkone/thread-safety-stuffRafael Mendonça França2013-09-282-13/+27
|\ \ | | | | | | Thread safety fixes
| * | Make GTG::TransTable thread safe.thedarkone2013-09-281-12/+23
| | | | | | | | | | | | From now on only the `[]=` method is allowed to modify the internal states hashes.
| * | Replace global Hash with TS::Cache.thedarkone2013-09-281-1/+4
| | |
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-09-281-1/+1
|\ \ \ | |/ / |/| |
| * | Fix link_to return valueEarl J St Sauver2013-09-221-1/+1
| | | | | | | | | | | | | | | | | | The documentation is showing the link_to method as just returning the contents of the url_for method. It should be returning an "<a>" tag with the correct href set.
* | | No need the else clauseRafael Mendonça França2013-09-241-2/+0
| | |
* | | Use join to concat the both side of the ASTRafael Mendonça França2013-09-241-1/+2
| | | | | | | | | | | | Onf of the sides can be nil and it will raise a Conversion error
* | | Merge pull request #10773 from wangjohn/link_and_routing_optionsRafael Mendonça França2013-09-231-0/+13
|\ \ \ | | | | | | | | | | | | Adding documentation and tests to ``polymorphic_url`` and ``link_to``
| * | | Adding documentation to +polymorphic_url+wangjohn2013-06-131-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | concerning the options that it inherits from +url_for+. The way that +polymorhpic_url+ is built allows it to have options like +:anchor+, +:script_name+, etc. but this is currently not documented.
* | | | Merge pull request #9155 from bogdan/route-formatterAndrew White2013-09-221-23/+23
|\ \ \ \ | | | | | | | | | | Rewrite Journey::Visitors::Formatter for performance
| * | | | Rewrite journey routes formatter for performanceBogdan Gusiev2013-08-281-23/+23
| | | | |
* | | | | [ci skip] Add some comment about downcase url encoded string.kennyj2013-09-221-0/+2
| | | | |
* | | | | Fix incorrect assert_redirected_to failure messageDerek Prior2013-09-191-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some instances, `assert_redirected_to` assertion was returning an incorrect and misleading failure message when the assertion failed. This was due to a disconnect in how the assertion computes the redirect string for the failure message and how `redirect_to` computes the string that is actually used for redirection. I made the `_compute_redirect_to_loaction` method used by `redirect_to` public and call that from the method `assert_redirect_to` uses to calculate the URL. The reveals a new test failure due to the regex used by `_compute_redirect_to_location` allow `_` in the URL scheme.
* | | | | Remove 1.8 compatible codekennyj2013-09-191-1/+1
| | | | |
* | | | | Fix an issue where router can't recognize downcased url encoding path.kennyj2013-09-191-0/+1
| | | | |
* | | | | Merge pull request #12216 from suginoy/a-anRafael Mendonça França2013-09-132-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix typos: the indefinite articles(a -> an).
| * | | | | Fix typos: the indefinite articles(a -> an)SUGINO Yasuhiro2013-09-132-2/+2
| | | | | |
* | | | | | Revert "Merge pull request #12208 from mjhoy/patch-1"Rafael Mendonça França2013-09-121-0/+4
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ab5cd54b7e791f8419f689d1bef5394890268a6f, reversing changes made to cdc10c898d4865302740340eedec4f5f4ca76565. Reason: This way of defining root path is still supported. See https://github.com/rails/rails/blob/d262773ab7f0aae5de2d354ac2eca168e95b653d/actionpack/test/controller/routing_test.rb#L450-457
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-09-131-10/+10
|\ \ \ \ \
| * | | | | Change documentation to consistently refer to the same objectEarl J St Sauver2013-09-081-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation in this section is referring to a profile, so the resource that's created should probably also be a profile of some sort.
| * | | | | Blacklist refferenced in docs is actually whitelistEarl J St Sauver2013-09-081-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | The docs refference a blacklist, but really what's being described is a whitelist. Anything that matches the constraint gets through to the path.
* | | | | remove outdated docsMichael Hoy2013-09-121-4/+0
| | | | |
* | | | | Refactor handling of action normalizationMax Shytikov2013-09-101-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference: Bloody mess internals http://gusiev.com/slides/rails_contribution/static/#40
* | | | | Merge pull request #12077 from estsauver/doc_fixSteve Klabnik2013-09-041-2/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Update mapper documenation for match helper [ci skip]
| * | | | Update mapper documenation for match helper [ci skip]Earl St Sauver2013-08-301-2/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This piece of documentation is out of date. The use of match without any via option is prevented, now the HTTP verbs have to be explicitly set. If they're not set then the error message in normalize_conditions! (around line 186) is shown.
* | | | Reuse variable to avoid symbol usageCarlos Antonio da Silva2013-08-311-2/+2
| | | |
* | | | Merge pull request #11912 from jonkessler/respond-to-signature-fixesRafael Mendonça França2013-08-311-1/+1
|\ \ \ \ | |/ / / |/| | | Update Rails::Railtie::Configuration and ActionDispatch::Response#respond_to? to accept include_private argument
| * | | update Rails::Railtie::Configuration and ↵Jon Kessler2013-08-161-1/+1
| | | | | | | | | | | | | | | | ActionDispatch::Response#respond_to? to accept include_private argument
* | | | Display exceptions in text format for xhr requestKir Shatrov2013-08-2213-13/+84
| | | |
* | | | Escape the message of an exception in debug_exceptions to avoid bad renderingAdrien Siami2013-08-215-5/+5
| | | |
* | | | Use each_with_objectSantiago Pastorino2013-08-191-4/+2
| | | |
* | | | Organize normalize_encoding_params' conditionals a bit better and use a case ↵Santiago Pastorino2013-08-191-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | statement for it Refactor of the work done in #11891
* | | | Merge pull request #11891 from robertomiranda/remove_upload_moduleSantiago Pastorino2013-08-193-14/+2
|\ \ \ \ | | | | | | | | | | Normalize file parameters in same place as other parameters (ActionDispatch::Http::Parameters#normalize_encode_params)
| * | | | Normalize file parameters in same place as other parameters ↵robertomiranda2013-08-143-14/+2
| |/ / / | | | | | | | | | | | | (ActionDispatch::Http::Parameters#normalize_encode_params)
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-08-171-13/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionview/README.rdoc activerecord/lib/active_record/migration.rb guides/source/development_dependencies_install.md guides/source/getting_started.md
| * | | Revert "Merge branch 'master' of github.com:rails/docrails"Vijay Dev2013-08-171-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9. Seems to be a code merge done by mistake.
* | | | Pass assert_dom_equal message arg to underlying assertionRyan McGeary2013-08-041-4/+4
|/ / / | | | | | | | | | | | | #assert_dom_equal and #assert_dom_not_equal both take a "failure" message argument, but this argument was not utilized.
* | | Refactor handling of action normalizationMax Shytikov2013-07-261-11/+13
| | | | | | | | | | | | | | | | | | Reference: Bloody mess internals http://gusiev.com/slides/rails_contribution/static/#40
* | | Allow overriding of all headers from passed environment hashAndrew White2013-07-251-5/+5
| | | | | | | | | | | | | | | | | | | | | Allow REMOTE_ADDR, HTTP_HOST and HTTP_USER_AGENT to be overridden from the environment passed into `ActionDispatch::TestRequest.new`. Fixes #11590
* | | Clear named routes when routes.rb is reloadedAndrew White2013-07-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix an issue where Journey was failing to clear the named routes hash when the routes were reloaded and since it doesn't overwrite existing routes then if a route changed but wasn't renamed it kept the old definition. This was being masked by the optimised url helpers so it only became apparent when passing an options hash to the url helper.
* | | Refactor to reduce number of loopsAndrew White2013-07-171-15/+25
| | | | | | | | | | | | | | | | | | Only build the missing_keys array once we have detected that there actually are missing keys by moving the check to be part of the block that performs the path substitution.
* | | Fix failing test missed for the past year :(Andrew White2013-07-171-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | When optimized path helpers were re-introduced in d7014bc the test added in a328f2f broke but no-one noticed because it wasn't being run by the test suite. Fix the test by checking for nil values or empty strings after the args have been parameterized.
* | | Skip Rack applications and redirects when generating urlsAndrew White2013-07-162-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating an unnamed url (i.e. using `url_for` with an options hash) we should skip anything other than standard Rails routes otherwise it will match the first mounted application or redirect and generate a url with query parameters rather than raising an error if the options hash doesn't match any defined routes. Fixes #8018
* | | Merge pull request #11351 from jetthoughts/cleanup_requestRafael Mendonça França2013-07-091-1/+1
|\ \ \ | | | | | | | | Use content_length method instead of ENV['CONTENT_LENGTH'].to_i
| * | | Use helper method to get ENV['CONTENT_LENGTH']Paul Nikitochkin2013-07-081-1/+1
| | | |
* | | | Use Request#raw_post instead Request#bodyPaul Nikitochkin2013-07-081-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | In order to get raw_post to be not empty after ParamsParser#parse_formatted_parameters, added rewinding of body stream input on parsing json params. Closes #11345
* | | Space is not required for Set-Cookie headerYamagishi Kazutoshi2013-07-051-1/+1
| | |
* | | remove useless `env.merge!(env)` from ActionDispatch::IntegrationTest`Yves Senn2013-07-041-2/+0
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 02:32:33 +0000