Automatic merge of gitlab-org/gitlab master

.rubocop.yml

@@ -569,9 +569,6 @@ RSpec/ImplicitSubject:
 RSpec/DescribedClass:
   Enabled: false
 
-RSpec/EmptyLineAfterExampleGroup:
-  Enabled: false
-
 RSpec/ReceiveNever:
   Enabled: false
 

.rubocop_todo/rspec/empty_line_after_example_group.yml

+---
+# Cop supports --auto-correct.
+RSpec/EmptyLineAfterExampleGroup:
+  Exclude:
+    - 'ee/spec/controllers/groups/clusters_controller_spec.rb'
+    - 'ee/spec/controllers/groups/groups_controller_spec.rb'
+    - 'ee/spec/features/projects/feature_flags/user_sees_feature_flag_list_spec.rb'
+    - 'ee/spec/features/security/group/private_access_spec.rb'
+    - 'ee/spec/lib/gitlab/vulnerabilities/container_scanning_vulnerability_spec.rb'
+    - 'ee/spec/services/ee/gpg_keys/create_service_spec.rb'
+    - 'ee/spec/services/ee/issues/create_from_vulnerability_data_service_spec.rb'
+    - 'ee/spec/services/vulnerabilities/confirm_service_spec.rb'
+    - 'ee/spec/services/vulnerabilities/dismiss_service_spec.rb'
+    - 'ee/spec/services/vulnerabilities/resolve_service_spec.rb'
+    - 'ee/spec/services/vulnerabilities/revert_to_detected_service_spec.rb'
+    - 'ee/spec/services/vulnerability_issue_links/create_service_spec.rb'
+    - 'ee/spec/services/vulnerability_issue_links/delete_service_spec.rb'
+    - 'qa/spec/support/loglinking_spec.rb'
+    - 'spec/controllers/explore/projects_controller_spec.rb'
+    - 'spec/controllers/projects/notes_controller_spec.rb'
+    - 'spec/factories/projects/ci_feature_usages.rb'
+    - 'spec/features/security/group/internal_access_spec.rb'
+    - 'spec/features/security/group/private_access_spec.rb'
+    - 'spec/features/security/group/public_access_spec.rb'
+    - 'spec/helpers/blob_helper_spec.rb'
+    - 'spec/helpers/git_helper_spec.rb'
+    - 'spec/lib/bulk_imports/projects/pipelines/issues_pipeline_spec.rb'
+    - 'spec/lib/gitlab/blob_helper_spec.rb'
+    - 'spec/lib/gitlab/file_type_detection_spec.rb'
+    - 'spec/lib/gitlab/git/repository_spec.rb'
+    - 'spec/lib/gitlab/sidekiq_daemon/memory_killer_spec.rb'
+    - 'spec/models/concerns/token_authenticatable_strategies/encrypted_spec.rb'
+    - 'spec/models/note_spec.rb'
+    - 'spec/models/project_feature_spec.rb'
+    - 'spec/models/user_spec.rb'
+    - 'spec/models/zoom_meeting_spec.rb'
+    - 'spec/requests/api/graphql/project/issues_spec.rb'
+    - 'spec/requests/api/projects_spec.rb'
+    - 'spec/routing/project_routing_spec.rb'

GITALY_SERVER_VERSION

-8263b2f7f00bb5197a1b97f2a420c5662af8e40c
+bcabbb9feb2e80a3dd9930a6033997a364996368

VERSION

-15.3.0-pre
\ No newline at end of file
+15.4.0-pre
\ No newline at end of file

config/feature_flags/ops/database_async_index_destruction.yml

----
-name: database_async_index_destruction
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92328
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367964
-milestone: '15.3'
-type: ops
-group: group::database
-default_enabled: false

doc/development/database/adding_database_indexes.md

@@ -328,8 +328,8 @@ asynchronously during weekend hours. Due to generally lower traffic and fewer de
 index destruction can proceed at a lower level of risk.
 
 1. [Schedule the index to be removed](#schedule-the-index-to-be-removed).
-1. [Verify the MR was deployed and the index exists in production](#verify-the-mr-was-deployed-and-the-index-exists-in-production).
-1. [Add a migration to create the index synchronously](#add-a-migration-to-create-the-index-synchronously).
+1. [Verify the MR was deployed and the index exists in production](#verify-the-mr-was-deployed-and-the-index-no-longer-exists-in-production).
+1. [Add a migration to destroy the index synchronously](#add-a-migration-to-destroy-the-index-synchronously).
 
 ### Schedule the index to be removed
 
@@ -357,21 +357,21 @@ to remove them.
 
 You must test the database index changes locally before creating a merge request.
 
-### Verify the MR was deployed and the index exists in production
+### Verify the MR was deployed and the index no longer exists in production
 
 You can verify if the MR was deployed to GitLab.com with
 `/chatops run auto_deploy status <merge_sha>`. To verify the existence of
 the index, you can:
 
 - Use a meta-command in `#database-lab`, for example: `\d <index_name>`.
-  - Make sure the index is not [`invalid`](https://www.postgresql.org/docs/12/sql-createindex.html#:~:text=The%20psql%20%5Cd%20command%20will%20report%20such%20an%20index%20as%20INVALID).
+- Make sure the index no longer exists
 - Ask someone in `#database` to check if the index exists.
 - If you have access, you can verify directly on production or in a
   production clone.
 
 ### Add a migration to destroy the index synchronously
 
-After you verify the index exists in the production database, create a second
+After you verify the index no longer exists in the production database, create a second
 merge request that removes the index synchronously. The schema changes must be
 updated and committed to `structure.sql` in this second merge request.
 The synchronous migration results in a no-op on GitLab.com, but you should still add the
@@ -379,7 +379,7 @@ migration as expected for other installations. For example, to
 create the second migration for the previous asynchronous example:
 
 **WARNING:**
-Verify that the index no longer exist in production before merging a second migration with `remove_concurrent_index_by_name`.
+Verify that the index no longer exists in production before merging a second migration with `remove_concurrent_index_by_name`.
 If the second migration is deployed before the index has been destroyed,
 the index is destroyed synchronously when the second migration executes.
 
@@ -395,7 +395,7 @@ def up
 end
 
 def down
-  add_concurrent_index :ci_builds, :some_column, INDEX_NAME
+  add_concurrent_index :ci_builds, :some_column, name: INDEX_NAME
 end
 ```
 
@@ -403,7 +403,7 @@ end
 
 To test changes for removing an index, use the asynchronous index helpers on your local environment:
 
-1. Enable the feature flags by running `Feature.enable(:database_async_index_destruction)` and `Feature.enable(:database_reindexing)` in the Rails console.
+1. Enable the feature flags by running `Feature.enable(:database_reindexing)` in the Rails console.
 1. Run `bundle exec rails db:migrate` which should create an entry in the `postgres_async_indexes` table.
 1. Run `bundle exec rails gitlab:db:reindex` destroy the index asynchronously.
 1. To verify the index, open the PostgreSQL console by using the [GDK](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/doc/howto/postgresql.md)

lib/gitlab/database/reindexing.rb

@@ -27,7 +27,7 @@ def self.invoke(database = nil)
 
           # Hack: Before we do actual reindexing work, create async indexes
           Gitlab::Database::AsyncIndexes.create_pending_indexes! if Feature.enabled?(:database_async_index_creation, type: :ops)
-          Gitlab::Database::AsyncIndexes.drop_pending_indexes! if Feature.enabled?(:database_async_index_destruction, type: :ops)
+          Gitlab::Database::AsyncIndexes.drop_pending_indexes!
 
           automatic_reindexing
         end

spec/features/projects/settings/repository_settings_spec.rb

@@ -209,7 +209,9 @@
       end
 
       it 'generates an SSH public key on submission', :js do
-        fill_in 'url', with: 'ssh://user@localhost/project.git'
+        fill_in 'url', with: ssh_url
+        expect(page).to have_css(".js-mirror-url-hidden[value=\"#{ssh_url}\"]", visible: false)
+
         select 'SSH public key', from: 'Authentication method'
 
         select_direction

spec/lib/gitlab/database/reindexing_spec.rb

@@ -46,25 +46,11 @@
       end
     end
 
-    context 'when async index destruction is enabled' do
-      it 'executes async index destruction prior to any reindexing actions' do
-        stub_feature_flags(database_async_index_destruction: true)
+    it 'executes async index destruction prior to any reindexing actions' do
+      expect(Gitlab::Database::AsyncIndexes).to receive(:drop_pending_indexes!).ordered.exactly(databases_count).times
+      expect(described_class).to receive(:automatic_reindexing).ordered.exactly(databases_count).times
 
-        expect(Gitlab::Database::AsyncIndexes).to receive(:drop_pending_indexes!).ordered.exactly(databases_count).times
-        expect(described_class).to receive(:automatic_reindexing).ordered.exactly(databases_count).times
-
-        described_class.invoke
-      end
-    end
-
-    context 'when async index destruction is disabled' do
-      it 'does not execute async index destruction' do
-        stub_feature_flags(database_async_index_destruction: false)
-
-        expect(Gitlab::Database::AsyncIndexes).not_to receive(:drop_pending_indexes!)
-
-        described_class.invoke
-      end
+      described_class.invoke
     end
 
     context 'calls automatic reindexing' do