aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Fixed an issue with migrating legacy json cookies.Godfrey Chan2014-04-233-2/+132
| | | | | | | | | | | | | Previously, the `VerifyAndUpgradeLegacySignedMessage` assumes all incoming cookies are marshal-encoded. This is not the case when `secret_token` is used in conjunction with the `:json` or `:hybrid` serializer. In those case, when upgrading to use `secret_key_base`, this would cause a `TypeError: incompatible marshal file format` and a 500 error for the user. Fixes #14774. *Godfrey Chan*
* Merge pull request #10764 from mokevnin/replace_class_eval_by_define_methodRafael Mendonça França2014-04-221-35/+29
|\ | | | | replace class_eval by define_method in abstract_controller/callbacks
| * replace class_eval by define_method in abstract_controller/callbackskirill2014-04-201-35/+29
| |
* | ActionController::Renderers documentation fixStevie Graham2014-04-201-2/+2
|/ | | | | ActionController::Renderers::RENDERERS is an instance of Set. Docs incorrectly state that it's a Hash.
* [ci skip] builtin -> built-inAkshay Vishnoi2014-04-201-1/+1
|
* Make URL escaping more consistentAndrew White2014-04-208-10/+89
| | | | | | | | | | | | | | | | | | | | | | 1. Escape '%' characters in URLs - only unescaped data should be passed to URL helpers 2. Add an `escape_segment` helper to `Router::Utils` that escapes '/' characters 3. Use `escape_segment` rather than `escape_fragment` in optimized URL generation 4. Use `escape_segment` rather than `escape_path` in URL generation For point 4 there are two exceptions. Firstly, when a route uses wildcard segments (e.g. *foo) then we use `escape_path` as the value may contain '/' characters. This means that wildcard routes can't be optimized. Secondly, if a `:controller` segment is used in the path then this uses `escape_path` as the controller may be namespaced. Fixes #14629, #14636 and #14070.
* Optimize URI escapingAndrew White2014-04-201-17/+42
| | | | | | | | | | | | | The URI::Parser#escape method is a general use method that has to deal with a variety of input however our use of it is limited in scope so we can increase the performance by implementing our specific needs within ActionDispatch::Journey::Router::Utils directly. If there is no encoding required then there is no change in performance or number of objects allocated, but for each character that needs to be encoded we save five object allocations and gain a performance boost. The performance boost seen varies from 20% when there is one character to over 50% when encoding ten characters.
* Always escape string passed to url helper.edogawaconan2014-04-202-3/+3
| | | | | | | | | | Makes it clear that anything passed with the helper must not be percent encoded. Fixes previous behavior which tricks people into believing passing non-percent-encoded will generate a proper percent-encoded path while in reality it doesn't ('%' isn't escaped). The intention is nice but the heuristic is broken.
* "subhash" --> "sub-hash"Akshay Vishnoi2014-04-191-2/+2
|
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-04-181-2/+2
|\
| * re-phrase how to run a testWaynn Lue2014-04-151-2/+2
| |
* | Remove wrapper div for inputs in button_toRafael Mendonça França2014-04-171-1/+1
| | | | | | | | Related with cbb917455f306cf5818644b162f22be09f77d4b2
* | Update Request forgery tests to remove input wrappign divRafael Mendonça França2014-04-171-5/+5
| | | | | | | | This was changed at cbb917455f306cf5818644b162f22be09f77d4b2
* | Add CHANGELOG entry for #14755 [ci skip]Rafael Mendonça França2014-04-171-0/+5
| |
* | Change the method descriptionRafael Mendonça França2014-04-171-1/+1
| |
* | Implement to_io as an aliasRafael Mendonça França2014-04-171-5/+1
| |
* | Merge pull request #14755 from timlinquist/to_io_http_uploadRafael Mendonça França2014-04-172-0/+11
|\ \ | | | | | | | | | Use common to_io so users can access the underlying IO object
| * | Provide interface for accessing underlying IO objectTim Linquist2014-04-152-0/+11
| | | | | | | | | | | | | | | | | | In some cases users may need to work with/manipulate more of the Tempfile api than provided by Upload. Allow users to get at the underlying io via the common to_io method of IO/IO-like objects
* | | Update AC::Metal documentation example [ci skip]Yury Velikanau2014-04-151-1/+2
| | | | | | | | | | | | Include proper module since AV was extracted form AP as mentioned in #14659.
* | | Merge pull request #14745 from razum2um/plain-text-diagnosticsRafael Mendonça França2014-04-153-1/+11
|\ \ \ | | | | | | | | Display diagnostics in text format for xhr request
| * | | Display diagnostics in text format for xhr requestVlad Bokov2014-04-143-1/+11
| | | |
* | | | Merge pull request #14728 from stomar/assertion-msgYves Senn2014-04-152-14/+16
|\ \ \ \ | | | | | | | | | | Remove surplus period from assertion messages
| * | | | Refine tests for assert_select failure messagesMarcus Stollsteimer2014-04-141-11/+13
| | | | |
| * | | | Remove surplus period from assertion messagesMarcus Stollsteimer2014-04-131-3/+3
| | | | |
* | | | | Merge pull request #14642 from tgxworld/fix_notifications_not_unsubscribingYves Senn2014-04-151-5/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix subscriptions not being unsubscribed.
| * | | | Fix subscriptions not being unsubscribed.Guo Xiang Tan2014-04-141-5/+7
| |/ / /
* | / / Return null type format when format is not knowRafael Mendonça França2014-04-143-1/+13
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When requesting a controller with the following code with a unknown format: def my_action respond_to do |format| format.json { head :ok } format.any { render text: 'Default response' } end end we should render the default response instead of raising ActionController::UnknownFormat Fixes #14462 Conflicts: actionpack/CHANGELOG.md actionpack/test/controller/mime/respond_with_test.rb Conflicts: actionpack/CHANGELOG.md
* | | Update documentation to use Rails.application insteadMarcel Morgan2014-04-132-2/+2
|/ / | | | | | | | | | | | | References to ``AppName::Application` removed in favour of ``Rails.application`` as generated with a new rails 4.1 app. [ci skip]
* | Add CHANGELOG entry for #14619 [ci skip]Rafael Mendonça França2014-04-111-0/+4
| |
* | Merge pull request #14619 from winston/enhance-routing-error-htmlRafael Mendonça França2014-04-111-63/+119
|\ \ | | | | | | | | | Enhance routing error html page
| * | Split search results into 'exact matches' and 'fuzzy matches'.Winston2014-04-111-60/+96
| | | | | | | | | | | | - also refactored the javascript.
| * | Improve CSS styling for routing error html page.Winston2014-04-111-7/+25
| | |
| * | Implement fuzzy matching for route search on routing error html page.Winston2014-04-111-8/+10
| | |
* | | Only make deeply nested routes shallow when parent is shallowAndrew White2014-04-112-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `:shallow` may be set at any point in the resource nesting we should only make the new and collection routes shallow when the parent is shallow. This is a bit of a hack but until the mapper is refactored to an object graph instead of a hash of merged values it's the best we can do. Fixes #14684.
* | | Add a failing test for a URL helper that was broken by a6b9ea2.James Coglan2014-04-101-0/+18
|/ /
* | Avoid URI parsingAndriel Nuernberg2014-04-092-5/+15
| | | | | | | | | | This parsing is unecessary once the Request object already has the needed information.
* | Remove unused `subclass_controller_with_flash_type_bar` var from flash test.Vipul A M2014-04-071-2/+2
| |
* | Fix setup of adding _flash_types test.Guo Xiang Tan2014-04-061-6/+15
| | | | | | | | | | | | | | Adding flash types to a controller within any of the tests will result in a global state change of the controller under test. This patch will prevent state leaks and allow us to run the test in random order.
* | push move_string in to `move`Aaron Patterson2014-04-011-14/+12
| |
* | combine move_regexp and move_string so we only loop over states onceAaron Patterson2014-04-011-9/+6
| |
* | do not create memo objects since we'll just throw them awayAaron Patterson2014-04-012-9/+11
| |
* | only ask if `t` is empty once.Aaron Patterson2014-04-011-4/+1
| |
* | Tiny doc fix for Strong ParametersIan C. Anderson2014-03-301-1/+1
| | | | | | - accepts_nested_attribute_for -> accepts_nested_attributes_for
* | Merge pull request #13890 from achempion/syntax-error-backtraceYves Senn2014-03-293-0/+47
|\ \ | |/ |/| append link to bad code when error type is SyntaxError
| * Append link to bad code to backtrace when exception is SyntaxErrorBoris Kuznetsov2014-03-273-0/+47
| |
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-291-0/+4
|\ \
| * | Mention required glob param name in match docs for mapperEarl St Sauver2014-03-201-0/+4
| | | | | | | | | | | | | | | | | | | | | THe match documentation doesn't mention any requirement of the parameter name requirement for matches. However, including a bare glob character without a variable assignment causes a parse error.
* | | Replace trivial regexp with string or index, twice as fastKelley Reynolds2014-03-282-2/+2
| |/ |/|
* | update comments to reflect that options support is not availableFrederick Cheung2014-03-251-2/+2
| |
* | Swapped parameters of assert_equal in assert_selectVishal Lal2014-03-222-1/+8
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 09:20:26 +0000