aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Integration tests support the OPTIONS http method"Rafael Mendonça França2013-05-161-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 changeArun Agrawal2013-05-131-2/+2
| | | | c43ca06ca091fc09e2c86bb051ac92b648f12b64
* Code cleanup for ActionDispatch::Flash#callJulian Vargas2013-05-121-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_warningCarlos Antonio da Silva2013-05-091-1/+0
|\ | | | | remove variable and fix warning
| * remove variable and fix warningVipul A M2013-05-091-1/+0
| |
* | rails -> Rails [ci skip]Prathamesh Sonpatki2013-05-091-1/+1
|/
* Fix that JSON and XML exception responses should give the HTTP error message ↵Jeremy Kemper2013-05-081-2/+2
| | | | for their status, by default, not the message from the underlying exception
* Merge pull request #10426 from tkrajcar/rescue-h1-fixCarlos Antonio da Silva2013-05-021-0/+6
|\ | | | | Add styling to h1 for default rescue layout
| * Add styling to h1Tim Krajcar2013-05-021-0/+6
| |
* | use constant for encodingNihad Abbasov2013-05-021-1/+1
|/
* Merge pull request #9857 from yyyc514/bad_params_should_400Aaron Patterson2013-04-301-0/+1
|\ | | | | failure to parse params should trigger a 400 Bad Request
| * failure to parse params should trigger a 400 Bad RequestJosh Goebel2013-03-211-0/+1
| |
* | add missing semicolon to journey parser.yBen Holley2013-04-301-0/+1
| |
* | Rack::Mount was replaced by Journey, Fixed commentGaurish Sharma2013-04-301-1/+1
| |
* | Merge pull request #10301 from vipulnsward/extract_in_mapperAndrew White2013-04-221-2/+4
|\ \ | | | | | | extract arrays to constants in Mapper
| * | extract arrays to constants in MapperVipul A M2013-04-221-2/+4
| | |
* | | Merge pull request #10299 from econsultancy/use-method-not-allowed-exceptionAndrew White2013-04-221-0/+1
|\ \ \ | |/ / |/| | Use MethodNotAllowed exception rather than UnknownHttpMethod
| * | Return a 405 response for unknown HTTP methodsLewis Marshall2013-04-221-0/+1
| | |
* | | extract no content response codes to a constantVipul A M2013-04-221-1/+2
|/ /
* | Refactor ActionDispatch::Http::URL.build_host_urlAndrew White2013-04-181-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 themAndrew White2013-04-182-3/+5
| |
* | Passing subdomain: '' to url_for removes the subdomain (instead of adding a ↵Derek Watson2013-04-182-1/+5
| | | | | | | | | | | | leading .) Adding a boolean route constraint checks for presence/absence of request property
* | make [] method in router more readablebuddhamagnet2013-04-151-1/+3
| |
* | Return nil for Mime::NullType#refAndrew White2013-04-101-0/+4
| |
* | Reverts rendering behavior when format is unknownGrzegorz Świrski2013-04-101-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 screenNikolay Shebanov2013-04-101-1/+1
| |
* | change array of array to hashVipul A M2013-04-091-6/+4
| |
* | Mark unused variables and make some style fixesAgis Anastasopoulos2013-04-089-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 routeswangjohn2013-04-051-12/+13
| | | | | | | | mapper) and adding a constant for all the possible scopes.
* | Merge pull request #9932 from senny/9913_routing_problemAndrew White2013-04-031-8/+12
|\ \ | | | | | | routing bugfixes when matching multiple paths
| * | routing shorthand syntax works with multiple pathsYves Senn2013-03-261-5/+6
| | | | | | | | | | | | | | | | | | Closes #9913. We need to expand the match shorthand syntax for every path.
| * | bugfix, when matching multiple paths with `get`, `post`, ...Yves Senn2013-03-261-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 Senn2013-04-031-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-renameSantiago Pastorino2013-04-021-1/+1
|\ \ \ | | | | | | | | Rename DummyKeyGenerator -> LegacyKeyGenerator
| * | | Rename DummyKeyGenerator -> LegacyKeyGeneratorTrevor Turk2013-04-021-1/+1
| | | |
* | | | :scissors: spacing after privateTrevor Turk2013-04-021-3/+0
| | | |
* | | | Be consistent when talking about cookies, key -> nameTrevor Turk2013-04-021-25/+25
| | | |
* | | | Fix permanent cookie jar accessor typoTrevor Turk2013-04-021-1/+1
|/ / /
* | | Improve documentation around the cookie store auto-upgrade to encryptionTrevor Turk2013-04-011-22/+37
| | |
* | | Merge pull request #9978 from trevorturk/cookie-store-auto-upgradeSantiago Pastorino2013-04-012-74/+78
|\ \ \ | | | | | | | | Cookie-base session store auto-upgrade
| * | | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵Trevor Turk2013-03-282-74/+78
| |/ / | | | | | | | | | Automatically configure cookie-based sessions to use the best cookie jar given the app's config
* | | fix wrong argument error messageVipul A M2013-03-311-1/+1
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-302-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 cf0931166be13dbbe660Steve Klabnik2013-03-191-1/+1
| | | | | | | | | I didn't know that this was about RDoc!
| * | Fixed small typosPrathamesh Sonpatki2013-03-192-2/+2
| | |
| * | The HTTP method helpers are preferred over match and should be explained ↵Trevor Turk2013-03-181-28/+16
| | | | | | | | | | | | before named routes
| * | The default route has been removedTrevor Turk2013-03-181-24/+0
| | |
| * | Using match without via is deprecatedTrevor Turk2013-03-181-12/+12
| | |
* | | if cookie is tampered with then nil is returned [ci skip]Neeraj Singh2013-03-251-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.
* | | Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing ↵Trevor Turk2013-03-241-99/+99
| | | | | | | | | | | | signed cookies generated by Rails 3 to avoid invalidating them when upgrading to Rails 4