diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2015-10-06 11:30:02 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2015-10-06 11:30:02 -0700 |
| commit | 71317e6406dba9a552760ec035b67b3c16162528 (patch) | |
| tree | 78cc5fc25b114c26e14d855370e16139dbd4b679 /actionpack/lib/action_controller/metal/http_authentication.rb | |
| parent | 5b69e30622de27e8010fd8cb32a97b5f0fe194e2 (diff) | |
| parent | 565094a8b5cdfa158fef6ae75252fd98a4ba8fe4 (diff) | |
| download | rails-71317e6406dba9a552760ec035b67b3c16162528.tar.gz rails-71317e6406dba9a552760ec035b67b3c16162528.tar.bz2 rails-71317e6406dba9a552760ec035b67b3c16162528.zip | |
Merge pull request #21869 from jeremy/mime-constant-deprecation
Use `Mime[:foo]` instead of `Mime::Type[:FOO]` for back compat
Diffstat (limited to 'actionpack/lib/action_controller/metal/http_authentication.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/http_authentication.rb | 4 |
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 fe470552b0..0a36fecd27 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::Type[:XML], Mime::Type[:ATOM] + # when Mime[:xml], Mime[: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::Type[:XML], Mime::Type[:ATOM] + # when Mime[:xml], Mime[:atom] # if user = authenticate_with_http_token { |t, o| @account.users.authenticate(t, o) } # @current_user = user # else |