| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | remove unnecessary memcache equire in ActionDispatch::Session::CacheStore | Brian Durand | 2012-02-28 | 1 | -1/+0 |
| | | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-25 | 1 | -1/+1 |
| |\ | | | | | | | | | Conflicts: actionmailer/CHANGELOG.md | ||||
| | * | Fix typo in match :to docs | Justin Woodbridge | 2012-02-23 | 1 | -1/+1 |
| | | | |||||
| * | | consistently mention first patch, then put | Xavier Noria | 2012-02-24 | 2 | -8/+8 |
| | | | | | | | | | | | | | There was a mix, sometimes patch first, sometimes put first. Use always patch first, since this is going to be the primary verb for updates. | ||||
| * | | uses PATCH for the forms of persisted records, and routes PATCH and PUT to ↵ | Xavier Noria | 2012-02-24 | 2 | -10/+8 |
| | | | | | | | | | the update action of resources | ||||
| * | | Avoid inspecting the whole route set, closes #1525 | José Valim | 2012-02-23 | 1 | -0/+6 |
| | | | |||||
| * | | Merge pull request #5084 from johndouthat/patch-1 | Aaron Patterson | 2012-02-22 | 1 | -2/+1 |
| |\ \ | | | | | | | Remove reference to rails_legacy_mapper, which isn't compatible with 3.2... | ||||
| | * | | Remove reference to rails_legacy_mapper, which isn't compatible with 3.2 #5022 | johndouthat | 2012-02-18 | 1 | -2/+1 |
| | |/ | |||||
| * | | Fix routes inspection order | Rafael Mendonça França | 2012-02-22 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #5130 from dlee/revised_patch_verb | Xavier Noria | 2012-02-22 | 5 | -67/+106 |
| |\ \ | | | | | | | Add config.default_method_for_update to support PATCH | ||||
| | * | | Add config.default_method_for_update to support PATCH | David Lee | 2012-02-22 | 5 | -67/+106 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PATCH is the correct HTML verb to map to the #update action. The semantics for PATCH allows for partial updates, whereas PUT requires a complete replacement. Changes: * adds config.default_method_for_update you can set to :patch * optionally use PATCH instead of PUT in resource routes and forms * adds the #patch verb to routes to detect PATCH requests * adds #patch? to Request * changes documentation and comments to indicate support for PATCH This change maintains complete backwards compatibility by keeping :put as the default for config.default_method_for_update. | ||||
| * | | | AS::Callbacks: deprecate rescuable option | Bogdan Gusiev | 2012-02-22 | 1 | -3/+9 |
| |/ / | |||||
| * | | Merge pull request #5082 from ↵ | Aaron Patterson | 2012-02-20 | 1 | -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 Bryant | 2012-02-18 | 1 | -1/+2 |
| | |/ | | | | | | | a hash | ||||
| * / | Integration tests support the OPTIONS http method | Jeremy Kemper | 2012-02-19 | 1 | -1/+7 |
| |/ | |||||
| * | Merge pull request #3479 from arvida/ensure-date-header-on-expires-in | José Valim | 2012-02-18 | 1 | -0/+14 |
| |\ | | | | | Ensure Date header on expires_in | ||||
| | * | Added accessor methods for Date header | arvida | 2011-10-31 | 1 | -0/+14 |
| | | | |||||
| * | | Simplify regexp | Andrew White | 2012-02-17 | 1 | -1/+1 |
| | | | |||||
| * | | Fix ActionDispatch::Static to serve files with unencoded PCHAR | Andrew White | 2012-02-17 | 1 | -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 unescaping | Sergey Nartimov | 2012-02-16 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #3305 from cjolly/request_filtered_env | Jeremy Kemper | 2012-02-13 | 1 | -1/+1 |
| |\ \ | | | | | | | Exclude rack.request.form_vars from request.filtered_env | ||||
| | * | | Exclude rack.request.form_vars from request.filtered_env | Chad Jolly | 2012-01-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix GH #4720. Routing problem with nested namespace and already camelized ↵ | kennyj | 2012-02-10 | 1 | -0/+5 |
| | | | | | | | | | | | | | controller option. | ||||
| * | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-09 | 1 | -3/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb | ||||
| | * | | | Stop referring to Atom as "ATOM" | Tom Stuart | 2012-02-05 | 1 | -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 documentation | Tom Stuart | 2012-02-05 | 1 | -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 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. | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |