Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/registrations_controller.rb')
-rw-r--r--app/controllers/registrations_controller.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 72636a89433..ed0f1687420 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -23,6 +23,7 @@ class RegistrationsController < Devise::RegistrationsController
before_action :load_recaptcha, only: :new
before_action only: [:create] do
check_rate_limit!(:user_sign_up, scope: request.ip)
+ invite_email # set for failure path so we still remember we are invite in form
end
feature_category :instance_resiliency
@@ -271,10 +272,15 @@ class RegistrationsController < Devise::RegistrationsController
def set_invite_params
if resource.email.blank? && params[:invite_email].present?
- resource.email = @invite_email = ActionController::Base.helpers.sanitize(params[:invite_email])
+ resource.email = invite_email
end
end
+ def invite_email
+ ActionController::Base.helpers.sanitize(params[:invite_email])
+ end
+ strong_memoize_attr :invite_email
+
def user_invited?
!!member_id
end