Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Fix match docs | Rafael Mendonça França | 2012-02-07 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Fixed force_ssl redirects to include original query params | Ryan McGeary | 2012-02-07 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActionController.force_ssl` redirects http URLs to their https equivalent; however, when a URL contains a query string, the resulting redirect lacked the original query string. Conflicts: actionpack/lib/action_controller/metal/force_ssl.rb | |||||
* | | | | Merge pull request #2490 from gsterndale/x_forwarded_for_order | José Valim | 2012-02-07 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | The first IP address in the X-Forwarded-For header is the originating IP | |||||
| * | | | | The first IP address in the X-Forwarded-For header is the originating IP | Greg Sterndale | 2012-02-07 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #2632 from gsterndale/replace_trusted_proxies | José Valim | 2012-02-07 | 1 | -4/+6 | |
|\ \ \ \ \ | | | | | | | | | | | | | Trusted proxies are configurable | |||||
| * | | | | | Trusted proxies is replaced with a Regexp or appended to with a String | Greg Sterndale | 2012-02-07 | 1 | -4/+6 | |
| |/ / / / | ||||||
* / / / / | Correctly handle single media with q value. Fixes #736. | Scott W. Bradley | 2012-02-06 | 1 | -1/+3 | |
|/ / / / | ||||||
* | | | | Fix url_for method's behavior when it is called with :controller option ↵ | kennyj | 2012-02-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | which starts with "/" from multiple nested controller. Closes #3864 | |||||
* | | | | Note the ways #match may be called | Jeremy Kemper | 2012-02-05 | 1 | -0/+3 | |
| | | | | ||||||
* | | | | Revert "Deprecated multi args to http route methods" | Jeremy Kemper | 2012-02-05 | 1 | -11/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Too painful to lose the compact shorthand form! This reverts commit e848c52535fa0f9488cdbdb3f1cedc7c7c02d643. Conflicts: actionpack/lib/action_dispatch/routing/mapper.rb | |||||
* | | | | Fix GH #4873. Allow swapping middleware of same class | kennyj | 2012-02-04 | 1 | -2/+3 | |
|/ / / | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-01 | 1 | -2/+2 | |
|\ \ \ | ||||||
| * | | | Fixing some double quotes that should be single quotes | Carol Nichols | 2012-01-29 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Fix typo in routing documentation | Wen-Tien Chang | 2012-02-01 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #4744 from ndbroadbent/replace_for_loops_with_enumerables | Santiago Pastorino | 2012-01-29 | 1 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | Replaced all 'for' loops with Enumerable#each | |||||
| * | | | | Replaced all 'for' loops with Enumerable#each | Nathan Broadbent | 2012-01-30 | 1 | -2/+2 | |
| |/ / / | ||||||
* / / / | Add 'image/pjpeg' format used by IE | Antonio Tapiador | 2012-01-29 | 1 | -1/+1 | |
|/ / / | | | | | | | http://msdn.microsoft.com/en-us/library/ms775147%28v=vs.85%29.aspx#_replace | |||||
* | | | Merge pull request #3775 from karevn/master | Aaron Patterson | 2012-01-24 | 1 | -1/+2 | |
|\ \ \ | | | | | | | | | Please pull my changes - they fix a rare problem with tests framework | |||||
| * | | | Fix: when using subdomains and constraints, request params were not passed ↵ | karevn | 2011-11-28 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | to constraints callback | |||||
* | | | | initialized the @segment_keys instance variable | Aaron Patterson | 2012-01-23 | 1 | -1/+4 | |
| | | | | ||||||
* | | | | Added custom regexps to ASTs that have literal nodes on either side of | Aaron Patterson | 2012-01-23 | 1 | -1/+20 | |
| | | | | | | | | | | | | | | | | symbol nodes. Fixes #4585 | |||||
* | | | | updated the warning signature | Aaron Patterson | 2012-01-23 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Deprecated multi args to http route methods | Aaron Patterson | 2012-01-23 | 1 | -0/+11 | |
| | | | | ||||||
* | | | | ActionDispatch::Cookies::CookieJar#deleted? predicate method. | Paul Annesley | 2012-01-24 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | Necessary in controller tests to determine if the CookieJar will delete the given cookie. | |||||
* | | | | stop splatting so much. We don't need :star:args everywhere | Aaron Patterson | 2012-01-20 | 1 | -7/+6 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #4497 from carlosantoniodasilva/action-controller-refactor | José Valim | 2012-01-17 | 1 | -1/+2 | |
|\ \ \ | | | | | | | | | Action controller refactor - remove Compatibility module | |||||
| * | | | Remove deprecated default_charset= from AC::Base | Carlos Antonio da Silva | 2012-01-17 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | This should be set globally as a configuration, using `config.action_dispatch.default_charset` instead | |||||
* | | | | Deprecate RAILS_CACHE constant. | kennyj | 2012-01-18 | 1 | -3/+2 | |
|/ / / | ||||||
* | | | use Rack::BodyProxy in AD::Reloader | Sergey Nartimov | 2012-01-16 | 2 | -33/+3 | |
| | | | ||||||
* | | | Add begin/ensure block since we are returning. | José Valim | 2012-01-14 | 1 | -3/+5 | |
| | | | ||||||
* | | | Use a BodyProxy instead of including a Module that responds to close. | Santiago Pastorino | 2012-01-13 | 2 | -14/+31 | |
| | | | | | | | | | | | | Closes #4441 if Active Record is disabled assets are delivered correctly | |||||
* | | | Delegate subdomain method to the URL module, removing duplication | Carlos Antonio da Silva | 2012-01-12 | 1 | -1/+1 | |
| | | | ||||||
* | | | Simplify named host logic and missing host condition check | Carlos Antonio da Silva | 2012-01-12 | 1 | -2/+2 | |
| | | | ||||||
* | | | Extract ip host regexp to a constant | Carlos Antonio da Silva | 2012-01-12 | 1 | -1/+3 | |
| | | | ||||||
* | | | Use MiniTest::Assertions instead of Test::Unit::Assertions | Rafael Mendonça França | 2012-01-06 | 1 | -2/+1 | |
| | | | ||||||
* | | | use assert_equal and assert_operator | Aaron Patterson | 2012-01-06 | 1 | -5/+8 | |
| | | | ||||||
* | | | use sprintf rather than build_message | Aaron Patterson | 2012-01-06 | 1 | -4/+6 | |
| | | | ||||||
* | | | Just use assert_equal | Aaron Patterson | 2012-01-06 | 1 | -3/+2 | |
| | | | ||||||
* | | | refactor assert_response | Aaron Patterson | 2012-01-06 | 1 | -7/+10 | |
| | | | ||||||
* | | | test response assertions | Aaron Patterson | 2012-01-06 | 1 | -8/+0 | |
| | | | ||||||
* | | | no need for assert_block | Aaron Patterson | 2012-01-06 | 1 | -3/+3 | |
| | | | ||||||
* | | | stop using build_message for creating a string | Aaron Patterson | 2012-01-06 | 1 | -1/+1 | |
| | | | ||||||
* | | | just use assert and refute rather than building messages | Aaron Patterson | 2012-01-06 | 1 | -6/+2 | |
| | | | ||||||
* | | | We should finalize the routes as soon as possible and not wait for the ↵ | José Valim | 2012-01-06 | 1 | -2/+0 | |
| | | | | | | | | | | | | controller to be loaded. | |||||
* | | | Fix routing test to use assert_equal | Carlos Antonio da Silva | 2012-01-06 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge pull request #4117 from lest/remove-deprecated | José Valim | 2012-01-05 | 1 | -6/+0 | |
|\ \ \ | | | | | | | | | remove status_code from AD::ShowExceptions and useless requires | |||||
| * | | | remove status_code from AD::ShowExceptions and useless requires | Sergey Nartimov | 2011-12-21 | 1 | -6/+0 | |
| | | | | ||||||
* | | | | Change more Array.wrap to Kernel#Array | Rafael Mendonça França | 2012-01-05 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Override respond_to? since we are also overriding method_missing. | José Valim | 2012-01-03 | 1 | -0/+4 | |
| | | | | ||||||
* | | | | Clean up routes inclusion and add some comments for the next soul that ↵ | José Valim | 2012-01-03 | 3 | -46/+49 | |
| | | | | | | | | | | | | | | | | decides to adventure on this code. |