diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-08 21:09:47 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-08 21:09:47 +0000 |
commit | 66108e3b34cdba3eab53e07fdde76f799c0edc9b (patch) | |
tree | 1ada683cd997f7e68c69d014e90c24e2a630049e /app/controllers/registrations_controller.rb | |
parent | c0c1433fa5a9f31c8eb4292d13de744aa74e9e83 (diff) | |
download | gitlab-ce-66108e3b34cdba3eab53e07fdde76f799c0edc9b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/registrations_controller.rb')
-rw-r--r-- | app/controllers/registrations_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index a6c5a6d8526..e96d0c4b1c4 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -8,7 +8,7 @@ class RegistrationsController < Devise::RegistrationsController layout :choose_layout - skip_before_action :required_signup_info, only: [:welcome, :update_registration] + skip_before_action :required_signup_info, :check_two_factor_requirement, only: [:welcome, :update_registration] prepend_before_action :check_captcha, only: :create before_action :whitelist_query_limiting, only: [:destroy] before_action :ensure_terms_accepted, |