diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 03:08:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 03:08:59 +0000 |
| commit | ddd268b03b6f35c68e5a89606dbfd516f72846fd (patch) | |
| tree | f2d7df84d421bc6deff26daa502687b0164b59be /app | |
| parent | 6168721025dd8e98caeb2bf6844273e6690eaf69 (diff) | |
| download | gitlab-ce-ddd268b03b6f35c68e5a89606dbfd516f72846fd.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/registrations_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 29b0c6b29ae..ed5e39478f1 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -13,6 +13,7 @@ class RegistrationsController < Devise::RegistrationsController before_action :whitelist_query_limiting, only: [:destroy] before_action :ensure_terms_accepted, if: -> { action_name == 'create' && Gitlab::CurrentSettings.current_application_settings.enforce_terms? } + before_action :load_recaptcha, only: :new def new if experiment_enabled?(:signup_flow) @@ -183,6 +184,10 @@ class RegistrationsController < Devise::RegistrationsController stored_location_for(user) || dashboard_projects_path end + def load_recaptcha + Gitlab::Recaptcha.load_configurations! + end + # Part of an experiment to build a new sign up flow. Will be resolved # with https://gitlab.com/gitlab-org/growth/engineering/issues/64 def choose_layout |