summaryrefslogtreecommitdiff
path: root/app/controllers/confirmations_controller.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-11 16:14:29 +0000
committerRobert Speicher <rspeicher@gmail.com>2016-04-21 20:20:09 -0400
commit50ed43e49099648fa5c242d0cee15f05e50349c3 (patch)
tree7b5f471f20bb550bcd2ce899aff1e09af78ac294 /app/controllers/confirmations_controller.rb
parentaea97991977bc2af27ce93f5b5e2bd9b7735999e (diff)
downloadgitlab-ce-50ed43e49099648fa5c242d0cee15f05e50349c3.tar.gz
Improved confirmation UXconfirmation-screen
Closes #4228
Diffstat (limited to 'app/controllers/confirmations_controller.rb')
-rw-r--r--app/controllers/confirmations_controller.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb
index af1faca93f6..7b66ad3f92c 100644
--- a/app/controllers/confirmations_controller.rb
+++ b/app/controllers/confirmations_controller.rb
@@ -1,7 +1,16 @@
class ConfirmationsController < Devise::ConfirmationsController
+ def almost_there
+ flash[:notice] = nil
+ render layout: "devise_empty"
+ end
+
protected
+ def after_resending_confirmation_instructions_path_for(resource)
+ users_almost_there_path
+ end
+
def after_confirmation_path_for(resource_name, resource)
if signed_in?(resource_name)
after_sign_in_path_for(resource)