summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-07 14:32:59 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-07 14:32:59 +0300
commit84d17f79655498f49d5c957c8f09aeef7cdc56c2 (patch)
treea9c5c255227362de2d13313dcbb74eeb8ff9d844 /app/controllers/application_controller.rb
parenta73df4f72d9d5fbc118b80cea6f6bda4f877f5df (diff)
downloadgitlab-ce-84d17f79655498f49d5c957c8f09aeef7cdc56c2.tar.gz
Skip require email for devise controllers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index cfc9550b79e..a3f39c23e08 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -11,7 +11,7 @@ class ApplicationController < ActionController::Base
before_filter :default_headers
before_filter :add_gon_variables
before_filter :configure_permitted_parameters, if: :devise_controller?
- before_filter :require_email
+ before_filter :require_email, unless: :devise_controller?
protect_from_forgery