aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorAbdelkader Boudih <terminale@gmail.com>2015-09-23 11:26:55 +0200
committerAbdelkader Boudih <terminale@gmail.com>2015-09-23 11:26:55 +0200
commitf5fe01e8366ae393aca93635a8f04d4ed3f7cdd7 (patch)
tree4ff0afb0c23a68178da44efef9c93f59d89e8591 /actionpack/lib/action_controller
parent1e9593a37cb9564d85bbb552b08c1084d35523fc (diff)
parent96eece6cb4f938ac8d6c88f9c357908836b4bd33 (diff)
downloadrails-f5fe01e8366ae393aca93635a8f04d4ed3f7cdd7.tar.gz
rails-f5fe01e8366ae393aca93635a8f04d4ed3f7cdd7.tar.bz2
rails-f5fe01e8366ae393aca93635a8f04d4ed3f7cdd7.zip
Merge pull request #21732 from amitsuroliya/mime_docs
Updated Mime Negotiations docs [ci skip]
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/http_authentication.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb
index 15d4562abb..0ff5ceb728 100644
--- a/actionpack/lib/action_controller/metal/http_authentication.rb
+++ b/actionpack/lib/action_controller/metal/http_authentication.rb
@@ -34,7 +34,7 @@ module ActionController
#
# def authenticate
# case request.format
- # when Mime::XML, Mime::ATOM
+ # when Mime::Type[:XML], Mime::Type[:ATOM]
# if user = authenticate_with_http_basic { |u, p| @account.users.authenticate(u, p) }
# @current_user = user
# else
@@ -361,7 +361,7 @@ module ActionController
#
# def authenticate
# case request.format
- # when Mime::XML, Mime::ATOM
+ # when Mime::Type[:XML], Mime::Type[:ATOM]
# if user = authenticate_with_http_token { |t, o| @account.users.authenticate(t, o) }
# @current_user = user
# else