Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix named routing regression from 3.2.13 | schneems | 2013-05-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | When named route that is nested is used in 3.2.13 Example `routes.rb`: ``` resources :nested do resources :builder, :controller => 'nested/builder' end ``` In 3.2.12 and 3.2.12 this named route would work: ``` nested_builder_path(:last_step, :nested_id => "foo") ``` Generating a url that looks like `/nested/foo/builder/last_step`. This PR fixes the regression when building urls via the optimized helper. Any explicit keys set in the options are removed from the list of implicitly mapped keys. Not sure if this is exactly how the original version worked, but this fixes this use case regression. | ||||
* | Revert "Integration tests support the OPTIONS http method" | Rafael Mendonça França | 2013-05-16 | 1 | -7/+1 |
| | | | | | | | | | | | | | | This reverts commit ad46884af567d6f8d6d8d777f372c39e81a560ba. Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/testing/integration.rb actionpack/test/controller/integration_test.rb Reason: It will conflict with a lot of test cases. Better to call `process` directly since this is a very uncommon HTTP method. Fixes #10638. | ||||
* | Fixing build broken by this change | Arun Agrawal | 2013-05-13 | 1 | -2/+2 |
| | | | | c43ca06ca091fc09e2c86bb051ac92b648f12b64 | ||||
* | Code cleanup for ActionDispatch::Flash#call | Julian Vargas | 2013-05-12 | 1 | -9/+3 |
| | | | | | | | The nested `if` was replaced by using `presence` which takes account for the given hash when it is `nil` or when it is empty. The `else` was removed because what it was doing was to assign to `env[KEY]` the value it already had. | ||||
* | Merge pull request #10536 from vipulnsward/fix_exp_warning | Carlos Antonio da Silva | 2013-05-09 | 1 | -1/+0 |
|\ | | | | | remove variable and fix warning | ||||
| * | remove variable and fix warning | Vipul A M | 2013-05-09 | 1 | -1/+0 |
| | | |||||
* | | rails -> Rails [ci skip] | Prathamesh Sonpatki | 2013-05-09 | 1 | -1/+1 |
|/ | |||||
* | Fix that JSON and XML exception responses should give the HTTP error message ↵ | Jeremy Kemper | 2013-05-08 | 1 | -2/+2 |
| | | | | for their status, by default, not the message from the underlying exception | ||||
* | Merge pull request #10426 from tkrajcar/rescue-h1-fix | Carlos Antonio da Silva | 2013-05-02 | 1 | -0/+6 |
|\ | | | | | Add styling to h1 for default rescue layout | ||||
| * | Add styling to h1 | Tim Krajcar | 2013-05-02 | 1 | -0/+6 |
| | | |||||
* | | use constant for encoding | Nihad Abbasov | 2013-05-02 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #9857 from yyyc514/bad_params_should_400 | Aaron Patterson | 2013-04-30 | 1 | -0/+1 |
|\ | | | | | failure to parse params should trigger a 400 Bad Request | ||||
| * | failure to parse params should trigger a 400 Bad Request | Josh Goebel | 2013-03-21 | 1 | -0/+1 |
| | | |||||
* | | add missing semicolon to journey parser.y | Ben Holley | 2013-04-30 | 1 | -0/+1 |
| | | |||||
* | | Rack::Mount was replaced by Journey, Fixed comment | Gaurish Sharma | 2013-04-30 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #10301 from vipulnsward/extract_in_mapper | Andrew White | 2013-04-22 | 1 | -2/+4 |
|\ \ | | | | | | | extract arrays to constants in Mapper | ||||
| * | | extract arrays to constants in Mapper | Vipul A M | 2013-04-22 | 1 | -2/+4 |
| | | | |||||
* | | | Merge pull request #10299 from econsultancy/use-method-not-allowed-exception | Andrew White | 2013-04-22 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Use MethodNotAllowed exception rather than UnknownHttpMethod | ||||
| * | | Return a 405 response for unknown HTTP methods | Lewis Marshall | 2013-04-22 | 1 | -0/+1 |
| | | | |||||
* | | | extract no content response codes to a constant | Vipul A M | 2013-04-22 | 1 | -1/+2 |
|/ / | |||||
* | | Refactor ActionDispatch::Http::URL.build_host_url | Andrew White | 2013-04-18 | 1 | -20/+49 |
| | | | | | | | | | | Add support for extracting the port from the :host option and for removing the subdomain by using nil, false or ''. | ||||
* | | Duplicate options before mutating them | Andrew White | 2013-04-18 | 2 | -3/+5 |
| | | |||||
* | | Passing subdomain: '' to url_for removes the subdomain (instead of adding a ↵ | Derek Watson | 2013-04-18 | 2 | -1/+5 |
| | | | | | | | | | | | | leading .) Adding a boolean route constraint checks for presence/absence of request property | ||||
* | | make [] method in router more readable | buddhamagnet | 2013-04-15 | 1 | -1/+3 |
| | | |||||
* | | Return nil for Mime::NullType#ref | Andrew White | 2013-04-10 | 1 | -0/+4 |
| | | |||||
* | | Reverts rendering behavior when format is unknown | Grzegorz Świrski | 2013-04-10 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | If a request has unknown format (eg. /foo.bar), the renderer fallbacks to default format. This patch reverts Rails 3.2 behavior after c2267db commit. Fixes issue #9654. | ||||
* | | Use camelize instead of capitalize on error screen | Nikolay Shebanov | 2013-04-10 | 1 | -1/+1 |
| | | |||||
* | | change array of array to hash | Vipul A M | 2013-04-09 | 1 | -6/+4 |
| | | |||||
* | | Mark unused variables and make some style fixes | Agis Anastasopoulos | 2013-04-08 | 9 | -13/+13 |
| | | | | | | | | It'd be a nice convention to mark the unused variables like this, now that Ruby 2 will issue no warnings for such vars being unused. | ||||
* | | Refactoring some reused code into a method (inside of the routes | wangjohn | 2013-04-05 | 1 | -12/+13 |
| | | | | | | | | mapper) and adding a constant for all the possible scopes. | ||||
* | | Merge pull request #9932 from senny/9913_routing_problem | Andrew White | 2013-04-03 | 1 | -8/+12 |
|\ \ | | | | | | | routing bugfixes when matching multiple paths | ||||
| * | | routing shorthand syntax works with multiple paths | Yves Senn | 2013-03-26 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | Closes #9913. We need to expand the match shorthand syntax for every path. | ||||
| * | | bugfix, when matching multiple paths with `get`, `post`, ... | Yves Senn | 2013-03-26 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | This problem was introduced with: https://github.com/rails/rails/commit/d03aa104e069be4e301efa8cefb90a2a785a7bff | ||||
* | | | fix regression in Mapper when `format:` was used in a `scope`. | Yves Senn | 2013-04-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Closes #10071 `#normalize_path!` depends on the options so we need to call `#normalize_options!` first to make sure everything is set correctly. | ||||
* | | | Merge pull request #10061 from trevorturk/dummy-key-generator-rename | Santiago Pastorino | 2013-04-02 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Rename DummyKeyGenerator -> LegacyKeyGenerator | ||||
| * | | | Rename DummyKeyGenerator -> LegacyKeyGenerator | Trevor Turk | 2013-04-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | :scissors: spacing after private | Trevor Turk | 2013-04-02 | 1 | -3/+0 |
| | | | | |||||
* | | | | Be consistent when talking about cookies, key -> name | Trevor Turk | 2013-04-02 | 1 | -25/+25 |
| | | | | |||||
* | | | | Fix permanent cookie jar accessor typo | Trevor Turk | 2013-04-02 | 1 | -1/+1 |
|/ / / | |||||
* | | | Improve documentation around the cookie store auto-upgrade to encryption | Trevor Turk | 2013-04-01 | 1 | -22/+37 |
| | | | |||||
* | | | Merge pull request #9978 from trevorturk/cookie-store-auto-upgrade | Santiago Pastorino | 2013-04-01 | 2 | -74/+78 |
|\ \ \ | | | | | | | | | Cookie-base session store auto-upgrade | ||||
| * | | | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵ | Trevor Turk | 2013-03-28 | 2 | -74/+78 |
| |/ / | | | | | | | | | | Automatically configure cookie-based sessions to use the best cookie jar given the app's config | ||||
* | | | fix wrong argument error message | Vipul A M | 2013-03-31 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-30 | 2 | -65/+29 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip] | ||||
| * | | Undo bad change in cf0931166be13dbbe660 | Steve Klabnik | 2013-03-19 | 1 | -1/+1 |
| | | | | | | | | | I didn't know that this was about RDoc! | ||||
| * | | Fixed small typos | Prathamesh Sonpatki | 2013-03-19 | 2 | -2/+2 |
| | | | |||||
| * | | The HTTP method helpers are preferred over match and should be explained ↵ | Trevor Turk | 2013-03-18 | 1 | -28/+16 |
| | | | | | | | | | | | | before named routes | ||||
| * | | The default route has been removed | Trevor Turk | 2013-03-18 | 1 | -24/+0 |
| | | | |||||
| * | | Using match without via is deprecated | Trevor Turk | 2013-03-18 | 1 | -12/+12 |
| | | | |||||
* | | | if cookie is tampered with then nil is returned [ci skip] | Neeraj Singh | 2013-03-25 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | if the given key is not found then verifier does raise `ActiveSupport::MessageVerifier::InvalidSignature` exception but this exception is resuced and finally nil is returned. |