Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Get rid of extra local var that does not add to the logic | Carlos Antonio da Silva | 2014-05-05 | 1 | -2/+2 |
| | | | | There are too many "action name" variables around the process method. | ||||
* | Improve CHANGELOG entry | Rafael Mendonça França | 2014-05-04 | 1 | -2/+2 |
| | |||||
* | Use assert_raises | Rafael Mendonça França | 2014-05-04 | 1 | -3/+1 |
| | |||||
* | Do not use short-circuit return | Rafael Mendonça França | 2014-05-04 | 1 | -2/+3 |
| | |||||
* | Merge pull request #11166 from xavier/callable_constraint_verification | Rafael Mendonça França | 2014-05-04 | 3 | -0/+29 |
|\ | | | | | | | | | | | | | Callable route constraint verification Conflicts: actionpack/CHANGELOG.md | ||||
| * | Verify that route constraints respond to the expected messages instead of ↵ | Xavier Defrang | 2013-06-28 | 3 | -0/+29 |
| | | | | | | | | silently failing to enforce the constraint | ||||
* | | Fix examples indent and improve #process docs a bit [ci skip] | Carlos Antonio da Silva | 2014-05-04 | 1 | -16/+14 |
| | | |||||
* | | Document ActionController::TestCase::Behavior#process | Gaurish Sharma | 2014-05-04 | 1 | -0/+27 |
| | | | | | | | | [ci skip] | ||||
* | | Remove tests method for test cases when controller can be inferred. | Guo Xiang | 2014-05-03 | 5 | -21/+1 |
| | | |||||
* | | Use #include? instead of #any?, make it simpler | Akshay Vishnoi | 2014-05-03 | 1 | -1/+1 |
| | | |||||
* | | passing a nil in the polymorphic array is not supported. remove nils before ↵ | Aaron Patterson | 2014-05-02 | 1 | -0/+4 |
| | | | | | | | | you call the method | ||||
* | | passing a nil should always raise an ArgumentError | Aaron Patterson | 2014-05-02 | 1 | -1/+0 |
| | | |||||
* | | Tiny follow up to #14915 [ci skip] | Robin Dupret | 2014-05-02 | 1 | -19/+18 |
| | | |||||
* | | only add the optiosn if they are not empty | Aaron Patterson | 2014-05-01 | 1 | -1/+3 |
| | | | | | | | | | | | | I think this is wrong, but it gets the build passing for now. We should always add options, but we need to make more guarantees about how the underlying url helper is called | ||||
* | | always pass options to the _url method | Aaron Patterson | 2014-05-01 | 1 | -3/+1 |
| | | |||||
* | | never merge url options in to the first data hash | Aaron Patterson | 2014-05-01 | 1 | -1/+1 |
| | | | | | | | | | | if you want options, don't mix them with the first hash, just pass them all in with the second hash | ||||
* | | Merge pull request #14915 from juanpastas/patch-1 | Rafael Mendonça França | 2014-05-01 | 1 | -20/+37 |
|\ \ | | | | | | | Update mapper.rb | ||||
| * | | [skip ci] Document: required `via` option in `match` routing method. | Juan David Pastas | 2014-04-30 | 1 | -20/+37 |
| | | | |||||
* | | | Merge pull request #12651 from cespare/ipv6-remote-ip-fixes | Rafael Mendonça França | 2014-05-01 | 3 | -2/+13 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Make remote_ip detection properly handle private IPv6 addresses Conflicts: actionpack/CHANGELOG.md | ||||
| * | | | Make remote_ip detection properly handle private IPv6 addresses | Caleb Spare | 2013-10-26 | 3 | -2/+13 |
| | | | | | | | | | | | | | | | | Fixes #12638. | ||||
* | | | | avoid calling extract_record multiple times | Aaron Patterson | 2014-04-30 | 1 | -3/+2 |
| | | | | |||||
* | | | | eliminate conditional when sending the named route method | Aaron Patterson | 2014-04-30 | 1 | -2/+4 |
| | | | | |||||
* | | | | do not allocate strings while creating urls | Aaron Patterson | 2014-04-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | don't allocate string on hash access | Aaron Patterson | 2014-04-30 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Fixed an issue with migrating legacy json cookies. | Godfrey Chan | 2014-04-23 | 3 | -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_method | Rafael Mendonça França | 2014-04-22 | 1 | -35/+29 |
|\ \ \ | | | | | | | | | replace class_eval by define_method in abstract_controller/callbacks | ||||
| * | | | replace class_eval by define_method in abstract_controller/callbacks | kirill | 2014-04-20 | 1 | -35/+29 |
| | | | | |||||
* | | | | ActionController::Renderers documentation fix | Stevie Graham | 2014-04-20 | 1 | -2/+2 |
|/ / / | | | | | | | | | | | | | ActionController::Renderers::RENDERERS is an instance of Set. Docs incorrectly state that it's a Hash. | ||||
* | | | [ci skip] builtin -> built-in | Akshay Vishnoi | 2014-04-20 | 1 | -1/+1 |
| | | | |||||
* | | | Make URL escaping more consistent | Andrew White | 2014-04-20 | 8 | -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 escaping | Andrew White | 2014-04-20 | 1 | -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. | edogawaconan | 2014-04-20 | 2 | -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 Vishnoi | 2014-04-19 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-04-18 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | re-phrase how to run a test | Waynn Lue | 2014-04-15 | 1 | -2/+2 |
| | | | | |||||
* | | | | Remove wrapper div for inputs in button_to | Rafael Mendonça França | 2014-04-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Related with cbb917455f306cf5818644b162f22be09f77d4b2 | ||||
* | | | | Update Request forgery tests to remove input wrappign div | Rafael Mendonça França | 2014-04-17 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | This was changed at cbb917455f306cf5818644b162f22be09f77d4b2 | ||||
* | | | | Add CHANGELOG entry for #14755 [ci skip] | Rafael Mendonça França | 2014-04-17 | 1 | -0/+5 |
| | | | | |||||
* | | | | Change the method description | Rafael Mendonça França | 2014-04-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Implement to_io as an alias | Rafael Mendonça França | 2014-04-17 | 1 | -5/+1 |
| | | | | |||||
* | | | | Merge pull request #14755 from timlinquist/to_io_http_upload | Rafael Mendonça França | 2014-04-17 | 2 | -0/+11 |
|\ \ \ \ | | | | | | | | | | | | | | | | Use common to_io so users can access the underlying IO object | ||||
| * | | | | Provide interface for accessing underlying IO object | Tim Linquist | 2014-04-15 | 2 | -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 Velikanau | 2014-04-15 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | Include proper module since AV was extracted form AP as mentioned in #14659. | ||||
* | | | | | Merge pull request #14745 from razum2um/plain-text-diagnostics | Rafael Mendonça França | 2014-04-15 | 3 | -1/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Display diagnostics in text format for xhr request | ||||
| * | | | | | Display diagnostics in text format for xhr request | Vlad Bokov | 2014-04-14 | 3 | -1/+11 |
| | | | | | | |||||
* | | | | | | Merge pull request #14728 from stomar/assertion-msg | Yves Senn | 2014-04-15 | 2 | -14/+16 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove surplus period from assertion messages | ||||
| * | | | | | | Refine tests for assert_select failure messages | Marcus Stollsteimer | 2014-04-14 | 1 | -11/+13 |
| | | | | | | | |||||
| * | | | | | | Remove surplus period from assertion messages | Marcus Stollsteimer | 2014-04-13 | 1 | -3/+3 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #14642 from tgxworld/fix_notifications_not_unsubscribing | Yves Senn | 2014-04-15 | 1 | -5/+7 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Fix subscriptions not being unsubscribed. | ||||
| * | | | | | | Fix subscriptions not being unsubscribed. | Guo Xiang Tan | 2014-04-14 | 1 | -5/+7 |
| |/ / / / / |