Add latest changes from gitlab-org/gitlab@master

11 files changed, 22 insertions, 52 deletions

diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index 870e6739416..a14e416dec2 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -385,6 +385,9 @@ Dangerfile
 /ee/app/controllers/registrations/
 /ee/spec/controllers/registrations/
 /ee/spec/requests/registrations/
+/ee/spec/features/registrations/saas/
+/ee/spec/support/helpers/saas_registration_helpers.rb
+/ee/spec/support/shared_contexts/saas_registration_settings_context.rb
 /ee/app/controllers/ee/registrations_controller.rb
 /ee/spec/controllers/ee/registrations_controller_spec.rb
 /ee/app/controllers/ee/registrations/
@@ -1518,6 +1521,11 @@ ee/lib/ee/api/entities/project.rb
 /ee/spec/frontend/remote_development/
 /ee/spec/frontend/**/remote_development/
 
+[Govern::Anti-abuse] @gitlab-org/modelops/anti-abuse
+/ee/app/controllers/users/identity_verification_controller.rb
+/ee/app/models/concerns/identity_verifiable.rb
+/ee/config/routes/identity_verification.rb
+
 # JiHu GitLab rules. See https://gitlab.com/gitlab-jh/gitlab-jh-enablement/-/issues/213#note_1024367528
 
 [JH Frontend] @jihulab/maintainers/frontend
diff --git a/app/views/admin/application_settings/_email.html.haml b/app/views/admin/application_settings/_email.html.haml
index ba178377035..2d45391a839 100644
--- a/app/views/admin/application_settings/_email.html.haml
+++ b/app/views/admin/application_settings/_email.html.haml
@@ -18,11 +18,10 @@
     .form-group
       = f.gitlab_ui_checkbox_component :user_deactivation_emails_enabled, _('Enable user deactivation emails'), help_text: _('Send emails to users upon account deactivation.')
 
-    - if Feature.enabled?(:deactivation_email_additional_text)
-      .form-group
-        = f.label :deactivation_email_additional_text, _('Additional text for deactivation email')
-        = f.text_area :deactivation_email_additional_text, class: 'form-control gl-form-input', rows: 4
-        .form-text.text-muted
-          = _('Text added to the body of user deactivation email messages. 1000 character limit.')
+    .form-group
+      = f.label :deactivation_email_additional_text, _('Additional text for deactivation email')
+      = f.text_area :deactivation_email_additional_text, class: 'form-control gl-form-input', rows: 4
+      .form-text.text-muted
+        = _('Text added to the body of user deactivation email messages. 1000 character limit.')
 
   = f.submit _('Save changes'), pajamas_button: true, data: { testid: 'save-changes-button' }
diff --git a/app/views/layouts/mailer/_user_deactivated_additional_text.html.haml b/app/views/layouts/mailer/_user_deactivated_additional_text.html.haml
index cabdd4b09ec..5104d4f6e11 100644
--- a/app/views/layouts/mailer/_user_deactivated_additional_text.html.haml
+++ b/app/views/layouts/mailer/_user_deactivated_additional_text.html.haml
@@ -1,3 +1,3 @@
-- return unless Feature.enabled?(:deactivation_email_additional_text) && Gitlab::CurrentSettings.deactivation_email_additional_text.present?
+- return unless Gitlab::CurrentSettings.deactivation_email_additional_text.present?
 %p
   = Gitlab::Utils.nlbr(Gitlab::CurrentSettings.deactivation_email_additional_text)
diff --git a/app/views/layouts/mailer/_user_deactivated_additional_text.text.erb b/app/views/layouts/mailer/_user_deactivated_additional_text.text.erb
index 5862c8059f9..0de59fe7a75 100644
--- a/app/views/layouts/mailer/_user_deactivated_additional_text.text.erb
+++ b/app/views/layouts/mailer/_user_deactivated_additional_text.text.erb
@@ -1,3 +1,3 @@
-<% return unless Feature.enabled?(:deactivation_email_additional_text) && Gitlab::CurrentSettings.deactivation_email_additional_text.present? %>
+<% return unless Gitlab::CurrentSettings.deactivation_email_additional_text.present? %>
 
 <%= Gitlab::CurrentSettings.deactivation_email_additional_text %>
diff --git a/config/feature_flags/development/deactivation_email_additional_text.yml b/config/feature_flags/development/deactivation_email_additional_text.yml
deleted file mode 100644
index a603d4cd77e..00000000000
--- a/config/feature_flags/development/deactivation_email_additional_text.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: deactivation_email_additional_text
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110033
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389538
-milestone: '15.9'
-type: development
-group: group::authentication and authorization
-default_enabled: true
diff --git a/config/routes.rb b/config/routes.rb
index 0eb69f708d8..82b2ef84a64 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -281,6 +281,7 @@ InitializerConnections.raise_if_new_database_connection do
     draw :explore
     draw :admin
     draw :dashboard
+    draw :identity_verification
     draw :user
     draw :project
     draw :unmatched_project
diff --git a/doc/administration/settings/email.md b/doc/administration/settings/email.md
index c79394ee407..bcf4bab6fc5 100644
--- a/doc/administration/settings/email.md
+++ b/doc/administration/settings/email.md
@@ -93,6 +93,7 @@ To disable these notifications:
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/355964) in GitLab 15.9 [with a flag](../../administration/feature_flags.md) named `deactivation_email_additional_text`. Disabled by default.
 > - [Enabled on self-managed and GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111882) in GitLab 15.9.
+> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/392761) in GitLab 16.5. Feature flag `deactivation_email_additional_text` removed.
 
 FLAG:
 On self-managed GitLab, by default this feature is available. To hide the feature, ask an
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb
index e87f47e5234..f372940a1e7 100644
--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
@@ -883,12 +883,9 @@ RSpec.describe 'Admin updates settings', feature_category: :shared do
 
     context 'Preferences page' do
       before do
-        stub_feature_flags(deactivation_email_additional_text: deactivation_email_additional_text_feature_flag)
         visit preferences_admin_application_settings_path
       end
 
-      let(:deactivation_email_additional_text_feature_flag) { true }
-
       describe 'Email page' do
         context 'when deactivation email additional text feature flag is enabled' do
           it 'shows deactivation email additional text field' do
@@ -903,14 +900,6 @@ RSpec.describe 'Admin updates settings', feature_category: :shared do
             expect(current_settings.deactivation_email_additional_text).to eq('So long and thanks for all the fish!')
           end
         end
-
-        context 'when deactivation email additional text feature flag is disabled' do
-          let(:deactivation_email_additional_text_feature_flag) { false }
-
-          it 'does not show deactivation email additional text field' do
-            expect(page).not_to have_field 'Additional text for deactivation email'
-          end
-        end
       end
 
       it 'change Help page' do
diff --git a/spec/lib/gitlab/exclusive_lease_spec.rb b/spec/lib/gitlab/exclusive_lease_spec.rb
index 2230cb9b90f..3310a8c4a07 100644
--- a/spec/lib/gitlab/exclusive_lease_spec.rb
+++ b/spec/lib/gitlab/exclusive_lease_spec.rb
@@ -424,9 +424,13 @@ RSpec.describe Gitlab::ExclusiveLease, :request_store, :clean_gitlab_redis_share
     describe '#try_obtain' do
       let(:lease) { described_class.new(unique_key, timeout: 3600) }
 
+      before do
+        allow(lease).to receive(:same_store).and_return(false)
+      end
+
       shared_examples 'acquires both locks' do
         it do
-          Gitlab::Redis::SharedState.with { |r| expect(r).to receive(:set).and_call_original }
+          Gitlab::Redis::SharedState.with { |r| expect(r).to receive(:set).and_return(true) }
           Gitlab::Redis::ClusterSharedState.with { |r| expect(r).to receive(:set).and_call_original }
 
           expect(lease.try_obtain).to be_truthy
diff --git a/spec/views/notify/user_deactivated_email.html.haml_spec.rb b/spec/views/notify/user_deactivated_email.html.haml_spec.rb
index 25d18e37cb9..cc005fc0502 100644
--- a/spec/views/notify/user_deactivated_email.html.haml_spec.rb
+++ b/spec/views/notify/user_deactivated_email.html.haml_spec.rb
@@ -28,18 +28,6 @@ RSpec.describe 'notify/user_deactivated_email.html.haml', feature_category: :use
         expect(rendered).to have_content(/So long and thanks for all the fish!$/)
       end
     end
-
-    context 'when additional text feature flag is disabled' do
-      before do
-        stub_feature_flags(deactivation_email_additional_text: false)
-      end
-
-      it 'does not display the additional text' do
-        render
-
-        expect(rendered).to have_content(/Please contact your GitLab administrator if you think this is an error\.$/)
-      end
-    end
   end
 
   context 'when additional text setting is not set' do
diff --git a/spec/views/notify/user_deactivated_email.text.erb_spec.rb b/spec/views/notify/user_deactivated_email.text.erb_spec.rb
index 8cf56816b92..60379714ff2 100644
--- a/spec/views/notify/user_deactivated_email.text.erb_spec.rb
+++ b/spec/views/notify/user_deactivated_email.text.erb_spec.rb
@@ -30,18 +30,6 @@ RSpec.describe 'notify/user_deactivated_email.text.erb', feature_category: :user
         expect(rendered).to have_content(/So long and thanks for all the fish!$/)
       end
     end
-
-    context 'when additional text feature flag is disabled' do
-      before do
-        stub_feature_flags(deactivation_email_additional_text: false)
-      end
-
-      it 'does not display the additional text' do
-        render
-
-        expect(rendered).to have_content(/Please contact your GitLab administrator if you think this is an error\.$/)
-      end
-    end
   end
 
   context 'when additional text setting is not set' do