summaryrefslogtreecommitdiff
path: root/app/controllers/sessions_controller.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-05-09 17:02:06 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-05-09 17:32:49 -0400
commit76873ce4a49be9a591082f7b96482ebdc9cace9d (patch)
tree3993eb50b53b06c93ee3f2e7c8bce4e3df51cd06 /app/controllers/sessions_controller.rb
parent3fb0fedd0415732b3c1bf0aaa66abf1197012d75 (diff)
downloadgitlab-ce-76873ce4a49be9a591082f7b96482ebdc9cace9d.tar.gz
Move "invalid 2FA code" error message to the flash
This makes it consistent with the Invalid email/password error message from the previous step.
Diffstat (limited to 'app/controllers/sessions_controller.rb')
-rw-r--r--app/controllers/sessions_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index e2a5c612579..b9757143119 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -63,7 +63,7 @@ class SessionsController < Devise::SessionsController
sign_in(user)
else
- @error = 'Invalid two-factor code'
+ flash.now[:alert] = 'Invalid two-factor code.'
render :two_factor and return
end
else