diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-10 00:08:39 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-10 00:08:39 +0300 |
commit | d4b2ad25a56a9baf41a27a2190458330645b3102 (patch) | |
tree | fdfa7d67e75eedb35bf689ade0b5d09f4bae3f4b /app/controllers/omniauth_callbacks_controller.rb | |
parent | 17deb2a503bb8163514fe37618bf36f75376b9ae (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
-rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 8650b6cbc6f..ac1d7ecc01c 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -306,7 +306,6 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController end def persist_accepted_terms_if_required(user) - return unless Feature.enabled?(:update_oauth_registration_flow) return unless user.persisted? return unless Gitlab::CurrentSettings.current_application_settings.enforce_terms? |