diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-02-24 16:35:48 -0800 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-02-24 16:35:48 -0800 |
| commit | 3008188cd6c0cca8789e8b7c57a4f896e2ff07d5 (patch) | |
| tree | 7cb1eb98c228cebaa343a417208f6ab8bf3c7a40 /actionpack/lib | |
| parent | b7a094536de6fdeb428aa79d21f1e2128169f45e (diff) | |
| download | rails-3008188cd6c0cca8789e8b7c57a4f896e2ff07d5.tar.gz rails-3008188cd6c0cca8789e8b7c57a4f896e2ff07d5.tar.bz2 rails-3008188cd6c0cca8789e8b7c57a4f896e2ff07d5.zip | |
consistently mention first patch, then put
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.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 14 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/url_helper.rb | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index ecad8b258b..4f55537fe2 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -537,7 +537,7 @@ module ActionDispatch # POST /admin/posts # GET /admin/posts/1 # GET /admin/posts/1/edit - # PUT/PATCH /admin/posts/1 + # PATCH/PUT /admin/posts/1 # DELETE /admin/posts/1 # # If you want to route /posts (without the prefix /admin) to @@ -571,7 +571,7 @@ module ActionDispatch # POST /admin/posts # GET /admin/posts/1 # GET /admin/posts/1/edit - # PUT/PATCH /admin/posts/1 + # PATCH/PUT /admin/posts/1 # DELETE /admin/posts/1 module Scoping # Scopes a set of routes to the given default options. @@ -666,7 +666,7 @@ module ActionDispatch # new_admin_post GET /admin/posts/new(.:format) admin/posts#new # edit_admin_post GET /admin/posts/:id/edit(.:format) admin/posts#edit # admin_post GET /admin/posts/:id(.:format) admin/posts#show - # admin_post PUT/PATCH /admin/posts/:id(.:format) admin/posts#update + # admin_post PATCH/PUT /admin/posts/:id(.:format) admin/posts#update # admin_post DELETE /admin/posts/:id(.:format) admin/posts#destroy # # === Options @@ -986,7 +986,7 @@ module ActionDispatch # POST /geocoder # GET /geocoder # GET /geocoder/edit - # PUT/PATCH /geocoder + # PATCH/PUT /geocoder # DELETE /geocoder # # === Options @@ -1038,7 +1038,7 @@ module ActionDispatch # POST /photos # GET /photos/:id # GET /photos/:id/edit - # PUT/PATCH /photos/:id + # PATCH/PUT /photos/:id # DELETE /photos/:id # # Resources can also be nested infinitely by using this block syntax: @@ -1054,7 +1054,7 @@ module ActionDispatch # POST /photos/:photo_id/comments # GET /photos/:photo_id/comments/:id # GET /photos/:photo_id/comments/:id/edit - # PUT/PATCH /photos/:photo_id/comments/:id + # PATCH/PUT /photos/:photo_id/comments/:id # DELETE /photos/:photo_id/comments/:id # # === Options @@ -1122,7 +1122,7 @@ module ActionDispatch # new_post_comment GET /posts/:post_id/comments/new(.:format) # edit_comment GET /sekret/comments/:id/edit(.:format) # comment GET /sekret/comments/:id(.:format) - # comment PUT/PATCH /sekret/comments/:id(.:format) + # comment PATCH/PUT /sekret/comments/:id(.:format) # comment DELETE /sekret/comments/:id(.:format) # # === Examples diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 62b3a344f8..69d54f6981 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -330,7 +330,7 @@ module ActionDispatch @integration_session = Integration::Session.new(app) end - %w(get post put patch head delete options cookies assigns + %w(get post patch put head delete options cookies assigns xml_http_request xhr get_via_redirect post_via_redirect).each do |method| define_method(method) do |*args| reset! unless integration_session diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index 93f476926c..8d7417809b 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -329,7 +329,7 @@ module ActionView remote = html_options.delete('remote') method = html_options.delete('method').to_s - method_tag = %w{put patch delete}.include?(method) ? method_tag(method) : "" + method_tag = %w{patch put delete}.include?(method) ? method_tag(method) : "" form_method = method == 'get' ? 'get' : 'post' form_options = html_options.delete('form') || {} |