diff options
author | 🙈 jacopo beschi 🙉 <intrip@gmail.com> | 2018-05-17 12:19:47 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-05-17 12:19:47 +0300 |
commit | 01275667e323d4702cc396f6f756305b06cba726 (patch) | |
tree | ae8b900f5b94994f3126b1aff5b672eb02109722 /app/controllers/registrations_controller.rb | |
parent | bbd8d5b270a92b2b3ff707279cdac6d83ba67edf (diff) |
Resolve "Opening Project with invite but without accepting leads to 404 error page"
Diffstat (limited to 'app/controllers/registrations_controller.rb')
-rw-r--r-- | app/controllers/registrations_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 1848c806c41..f5a222b3a48 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -1,5 +1,6 @@ class RegistrationsController < Devise::RegistrationsController include Recaptcha::Verify + include AcceptsPendingInvitations before_action :whitelist_query_limiting, only: [:destroy] @@ -16,6 +17,7 @@ class RegistrationsController < Devise::RegistrationsController end if !Gitlab::Recaptcha.load_configurations! || verify_recaptcha + accept_pending_invitations super else flash[:alert] = 'There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.' @@ -60,7 +62,7 @@ class RegistrationsController < Devise::RegistrationsController def after_sign_up_path_for(user) Gitlab::AppLogger.info("User Created: username=#{user.username} email=#{user.email} ip=#{request.remote_ip} confirmed:#{user.confirmed?}") - user.confirmed? ? dashboard_projects_path : users_almost_there_path + user.confirmed? ? stored_location_for(user) || dashboard_projects_path : users_almost_there_path end def after_inactive_sign_up_path_for(resource) |