summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-17 13:15:59 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-17 13:15:59 +0300
commit966f68b33e1f15f08e383ec68346ed1bd690b59b (patch)
tree3b9d50dc1735b4de4eea024effb0367deb30182d
parentfd22d32bcd177fba4413c2f4c6eb4940c49a0aac (diff)
downloadgitlab-ce-966f68b33e1f15f08e383ec68346ed1bd690b59b.tar.gz
Refactor error message a bit
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/controllers/omniauth_callbacks_controller.rb12
1 files changed, 10 insertions, 2 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index 58d1e37f655..bd4b310fcbf 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -54,8 +54,16 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
# Only allow properly saved users to login.
if @user.persisted? && @user.valid?
sign_in_and_redirect(@user.gl_user)
- else @user.gl_user.errors.any?
- error_message = @user.gl_user.errors.map{ |attribute, message| "#{attribute} #{message}" }.join(", ")
+ else
+ error_message =
+ if @user.gl_user.errors.any?
+ @user.gl_user.errors.map do |attribute, message|
+ "#{attribute} #{message}"
+ end.join(", ")
+ else
+ ''
+ end
+
redirect_to omniauth_error_path(oauth['provider'], error: error_message) and return
end
end