Add latest changes from gitlab-org/gitlab@master

db/post_migrate/20230908082627_finalize_backfill_default_branch_protection_namespace_setting.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class FinalizeBackfillDefaultBranchProtectionNamespaceSetting < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  MIGRATION = 'BackfillDefaultBranchProtectionNamespaceSetting'
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: MIGRATION,
+      table_name: :namespace_settings,
+      column_name: :namespace_id,
+      job_arguments: []
+    )
+  end
+
+  def down
+    # noop
+  end
+end

db/post_migrate/20230926201357_drop_index_namespaces_on_type_and_visibility_and_parent_id.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class DropIndexNamespacesOnTypeAndVisibilityAndParentId < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  TABLE_NAME = 'namespaces'
+  INDEX_NAME = 'index_namespaces_on_type_and_visibility_and_parent_id'
+  CONDITIONS = "(type = 'Group' AND parent_id IS NULL AND visibility_level != 20)"
+
+  def up
+    remove_concurrent_index_by_name TABLE_NAME, INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index TABLE_NAME, :id, name: INDEX_NAME, where: CONDITIONS
+  end
+end

db/schema_migrations/20230908082627

@@ -0,0 +1 @@
+25bfecb56e1d08fba04e7ff47a8b080f045da637dbffb61021be5fc1f29cdd98

db/schema_migrations/20230926201357

@@ -0,0 +1 @@
+f943882abcb48cdf9b8fb7ad98342f0973026d45b127afd033a2a71393600ba8

db/structure.sql

@@ -33123,8 +33123,6 @@ CREATE INDEX index_namespaces_on_traversal_ids_for_groups_btree ON namespaces US
 
 CREATE INDEX index_namespaces_on_type_and_id ON namespaces USING btree (type, id);
 
-CREATE INDEX index_namespaces_on_type_and_visibility_and_parent_id ON namespaces USING btree (id) WHERE (((type)::text = 'Group'::text) AND (parent_id IS NULL) AND (visibility_level <> 20));
-
 CREATE INDEX index_namespaces_on_updated_at ON namespaces USING btree (updated_at);
 
 CREATE INDEX index_namespaces_public_groups_name_id ON namespaces USING btree (name, id) WHERE (((type)::text = 'Group'::text) AND (visibility_level = 20));

package.json

@@ -138,7 +138,7 @@
     "deckar01-task_list": "^2.3.1",
     "dexie": "^3.2.3",
     "diff": "^3.4.0",
-    "dompurify": "^3.0.5",
+    "dompurify": "^3.0.6",
     "dropzone": "^4.2.0",
     "editorconfig": "^0.15.3",
     "emoji-regex": "^10.0.0",

spec/features/issues/form_spec.rb

@@ -575,7 +575,7 @@ RSpec.describe 'New/edit issue', :js, feature_category: :team_planning do
     end
 
     context 'labels', :js do
-      it 'creates project label from dropdown' do
+      it 'creates project label from dropdown', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/416585' do
         find('[data-testid="labels-select-dropdown-contents"] button').click
 
         wait_for_all_requests

yarn.lock

@@ -5699,10 +5699,10 @@ dommatrix@^1.0.3:
   resolved "https://registry.yarnpkg.com/dommatrix/-/dommatrix-1.0.3.tgz#e7c18e8d6f3abdd1fef3dd4aa74c4d2e620a0525"
   integrity sha512-l32Xp/TLgWb8ReqbVJAFIvXmY7go4nTxxlWiAFyhoQw9RKEOHBZNnyGvJWqDVSPmq3Y9HlM4npqF/T6VMOXhww==
 
-dompurify@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.5.tgz#eb3d9cfa10037b6e73f32c586682c4b2ab01fbed"
-  integrity sha512-F9e6wPGtY+8KNMRAVfxeCOHU0/NPWMSENNq4pQctuXRqqdEPW7q3CrLbR5Nse044WwacyjHGOMlvNsBe1y6z9A==
+dompurify@^3.0.5, dompurify@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.6.tgz#925ebd576d54a9531b5d76f0a5bef32548351dae"
+  integrity sha512-ilkD8YEnnGh1zJ240uJsW7AzE+2qpbOUYjacomn3AvJ6J4JhKGSZ2nh4wUIXPZrEPppaCLx5jFe8T89Rk8tQ7w==
 
 domutils@^2.5.2, domutils@^2.6.0, domutils@^2.8.0:
   version "2.8.0"