Merge pull request #1953 from ka8725/master

Use request_format method instead of direct code
heartcombo · Jun 26, 2012 · 6c80839 · 6c80839
2 parents caa8961 + 972ac3b
commit 6c80839
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/controllers/devise_controller.rb b/app/controllers/devise_controller.rb
@@ -72,7 +72,7 @@ def assert_is_devise_resource! #:nodoc:
 
 2) You are testing a Devise controller bypassing the router.
    If so, you can explicitly tell Devise which mapping to use:
-   
+
    @request.env["devise.mapping"] = Devise.mappings[:user]
 
 MESSAGE
@@ -187,6 +187,6 @@ def request_format
   end
 
   def is_navigational_format?
-    Devise.navigational_formats.include?(request.format.try(:ref))
+    Devise.navigational_formats.include?(request_format)
   end
 end