aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5082 from ↵Aaron Patterson2012-02-201-1/+2
|\ | | | | | | | | willbryant/assigns_should_not_stringify_values_master assigns(:foo) should not convert @foo's keys to strings if it happens to be a hash
| * assigns(:foo) should not convert @foo's keys to strings if it happens to be ↵Will Bryant2012-02-181-1/+2
| | | | | | | | a hash
* | Integration tests support the OPTIONS http methodJeremy Kemper2012-02-191-1/+7
|/
* Merge pull request #3479 from arvida/ensure-date-header-on-expires-inJosé Valim2012-02-181-0/+14
|\ | | | | Ensure Date header on expires_in
| * Added accessor methods for Date headerarvida2011-10-311-0/+14
| |
* | Simplify regexpAndrew White2012-02-171-1/+1
| |
* | Fix ActionDispatch::Static to serve files with unencoded PCHARAndrew White2012-02-171-1/+10
| | | | | | | | | | | | | | | | | | | | | | RFC 3986[1] allows sub-delim characters in path segments unencoded, however Rack::File requires them to be encoded so we use URI's unescape method to leave them alone and then escape them again. Also since the path gets passed to Dir[] we need to escape any glob characters in the path. [1]: http://www.ietf.org/rfc/rfc3986.txt
* | escape static file path to prevent double unescapingSergey Nartimov2012-02-161-1/+1
| |
* | Merge pull request #3305 from cjolly/request_filtered_envJeremy Kemper2012-02-131-1/+1
|\ \ | | | | | | Exclude rack.request.form_vars from request.filtered_env
| * | Exclude rack.request.form_vars from request.filtered_envChad Jolly2012-01-181-1/+1
| | |
* | | Fix GH #4720. Routing problem with nested namespace and already camelized ↵kennyj2012-02-101-0/+5
| | | | | | | | | | | | controller option.
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-091-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb
| * | | Stop referring to Atom as "ATOM"Tom Stuart2012-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | $ curl -s http://www.ietf.org/rfc/rfc4287 | grep -io ATOM | sort | uniq -c 582 atom 175 Atom
| * | | Remove assert_select_feed from assert_select_encoded documentationTom Stuart2012-02-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This documentation came from the assert_select plugin, but the assert_select_feed method was omitted when the plugin was merged into Rails in 3142502964f94d6144312ae2c368b4c4589fa25a.
* | | | Fix match docsRafael Mendonça França2012-02-071-1/+1
| | | |
* | | | Fixed force_ssl redirects to include original query paramsRyan McGeary2012-02-071-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_orderJosé Valim2012-02-071-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 IPGreg Sterndale2012-02-071-1/+1
| | | | |
* | | | | Merge pull request #2632 from gsterndale/replace_trusted_proxiesJosé Valim2012-02-071-4/+6
|\ \ \ \ \ | | | | | | | | | | | | Trusted proxies are configurable
| * | | | | Trusted proxies is replaced with a Regexp or appended to with a StringGreg Sterndale2012-02-071-4/+6
| |/ / / /
* / / / / Correctly handle single media with q value. Fixes #736.Scott W. Bradley2012-02-061-1/+3
|/ / / /
* | | | Fix url_for method's behavior when it is called with :controller option ↵kennyj2012-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | which starts with "/" from multiple nested controller. Closes #3864
* | | | Note the ways #match may be calledJeremy Kemper2012-02-051-0/+3
| | | |
* | | | Revert "Deprecated multi args to http route methods"Jeremy Kemper2012-02-051-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 classkennyj2012-02-041-2/+3
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-011-2/+2
|\ \ \
| * | | Fixing some double quotes that should be single quotesCarol Nichols2012-01-291-2/+2
| | | |
* | | | Fix typo in routing documentationWen-Tien Chang2012-02-011-1/+1
| | | |
* | | | Merge pull request #4744 from ndbroadbent/replace_for_loops_with_enumerablesSantiago Pastorino2012-01-291-2/+2
|\ \ \ \ | | | | | | | | | | Replaced all 'for' loops with Enumerable#each
| * | | | Replaced all 'for' loops with Enumerable#eachNathan Broadbent2012-01-301-2/+2
| |/ / /
* / / / Add 'image/pjpeg' format used by IE Antonio Tapiador2012-01-291-1/+1
|/ / / | | | | | | http://msdn.microsoft.com/en-us/library/ms775147%28v=vs.85%29.aspx#_replace
* | | Merge pull request #3775 from karevn/masterAaron Patterson2012-01-241-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 ↵karevn2011-11-281-1/+2
| | | | | | | | | | | | | | | | to constraints callback
* | | | initialized the @segment_keys instance variableAaron Patterson2012-01-231-1/+4
| | | |
* | | | Added custom regexps to ASTs that have literal nodes on either side ofAaron Patterson2012-01-231-1/+20
| | | | | | | | | | | | | | | | symbol nodes. Fixes #4585
* | | | updated the warning signatureAaron Patterson2012-01-231-1/+1
| | | |
* | | | Deprecated multi args to http route methodsAaron Patterson2012-01-231-0/+11
| | | |
* | | | ActionDispatch::Cookies::CookieJar#deleted? predicate method.Paul Annesley2012-01-241-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 everywhereAaron Patterson2012-01-201-7/+6
| |/ / |/| |
* | | Merge pull request #4497 from carlosantoniodasilva/action-controller-refactorJosé Valim2012-01-171-1/+2
|\ \ \ | | | | | | | | Action controller refactor - remove Compatibility module
| * | | Remove deprecated default_charset= from AC::BaseCarlos Antonio da Silva2012-01-171-1/+2
| | | | | | | | | | | | | | | | | | | | This should be set globally as a configuration, using `config.action_dispatch.default_charset` instead
* | | | Deprecate RAILS_CACHE constant.kennyj2012-01-181-3/+2
|/ / /
* | | use Rack::BodyProxy in AD::ReloaderSergey Nartimov2012-01-162-33/+3
| | |
* | | Add begin/ensure block since we are returning.José Valim2012-01-141-3/+5
| | |
* | | Use a BodyProxy instead of including a Module that responds to close.Santiago Pastorino2012-01-132-14/+31
| | | | | | | | | | | | Closes #4441 if Active Record is disabled assets are delivered correctly
* | | Delegate subdomain method to the URL module, removing duplicationCarlos Antonio da Silva2012-01-121-1/+1
| | |
* | | Simplify named host logic and missing host condition checkCarlos Antonio da Silva2012-01-121-2/+2
| | |
* | | Extract ip host regexp to a constantCarlos Antonio da Silva2012-01-121-1/+3
| | |
* | | Use MiniTest::Assertions instead of Test::Unit::AssertionsRafael Mendonça França2012-01-061-2/+1
| | |
* | | use assert_equal and assert_operatorAaron Patterson2012-01-061-5/+8
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 12:39:28 +0000