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:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-09-13 18:12:03 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-09-13 18:12:03 +0300
commit82b9539d93d7fd3d9d7ebccf4d4472d451e888da (patch)
tree318118d7375b1c509e0f3878eeef51543e4363e8 /app/controllers
parent3c293d24c3408d204be7d84d6319b373c83ff6ae (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/registrations/welcome_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/registrations/welcome_controller.rb b/app/controllers/registrations/welcome_controller.rb
index 6401b1070c0..a10de3836ba 100644
--- a/app/controllers/registrations/welcome_controller.rb
+++ b/app/controllers/registrations/welcome_controller.rb
@@ -8,6 +8,8 @@ module Registrations
include ::Gitlab::Utils::StrongMemoize
layout 'minimal'
+ # TODO: Once this is an ee + SaaS only feature, we can remove this.
+ # To be completed in https://gitlab.com/gitlab-org/gitlab/-/issues/411858
skip_before_action :check_two_factor_requirement
helper_method :welcome_update_params