Add latest changes from gitlab-org/gitlab@masterHEADmaster

7 files changed, 57 insertions, 0 deletions

diff --git a/db/migrate/20230508095017_add_project_shortcut_buttons_to_user_preferences.rb b/db/migrate/20230508095017_add_project_shortcut_buttons_to_user_preferences.rb
new file mode 100644
index 00000000000..e68148e17a5
--- /dev/null
+++ b/db/migrate/20230508095017_add_project_shortcut_buttons_to_user_preferences.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddProjectShortcutButtonsToUserPreferences < Gitlab::Database::Migration[2.1]
+  enable_lock_retries!
+
+  def change
+    add_column :user_preferences, :project_shortcut_buttons, :boolean, default: true, null: false
+  end
+end
diff --git a/db/post_migrate/20221207135755_finalize_add_namespaces_emails_enabled_column_data.rb b/db/post_migrate/20221207135755_finalize_add_namespaces_emails_enabled_column_data.rb
new file mode 100644
index 00000000000..c4fc2aad60b
--- /dev/null
+++ b/db/post_migrate/20221207135755_finalize_add_namespaces_emails_enabled_column_data.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class FinalizeAddNamespacesEmailsEnabledColumnData < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  MIGRATION = 'AddNamespacesEmailsEnabledColumnData'
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: MIGRATION,
+      table_name: :namespaces,
+      column_name: :id,
+      job_arguments: []
+    )
+  end
+
+  def down
+    # noop
+  end
+end
diff --git a/db/post_migrate/20221207135831_finalize_add_projects_emails_enabled_column_data.rb b/db/post_migrate/20221207135831_finalize_add_projects_emails_enabled_column_data.rb
new file mode 100644
index 00000000000..6118be6d4c4
--- /dev/null
+++ b/db/post_migrate/20221207135831_finalize_add_projects_emails_enabled_column_data.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class FinalizeAddProjectsEmailsEnabledColumnData < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  MIGRATION = 'AddProjectsEmailsEnabledColumnData'
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: MIGRATION,
+      table_name: :projects,
+      column_name: :id,
+      job_arguments: []
+    )
+  end
+
+  def down
+    # noop
+  end
+end
diff --git a/db/schema_migrations/20221207135755 b/db/schema_migrations/20221207135755
new file mode 100644
index 00000000000..e8a97fc717e
--- /dev/null
+++ b/db/schema_migrations/20221207135755
@@ -0,0 +1 @@
+b08b766dad288ad5d4b6cfa0d92288a38f553f20dbea997d5379ef2dc79f1f0c
\ No newline at end of file
diff --git a/db/schema_migrations/20221207135831 b/db/schema_migrations/20221207135831
new file mode 100644
index 00000000000..406e1e88841
--- /dev/null
+++ b/db/schema_migrations/20221207135831
@@ -0,0 +1 @@
+ad6101b9d46b7a7ae1c302c7880979b5a29ced6193dfe95e32495766f01b34d9
\ No newline at end of file
diff --git a/db/schema_migrations/20230508095017 b/db/schema_migrations/20230508095017
new file mode 100644
index 00000000000..00fefae99f6
--- /dev/null
+++ b/db/schema_migrations/20230508095017
@@ -0,0 +1 @@
+02a4bd854b5f2269c917fa15823f423544a165a37a6341f76c6555e4b11659f3
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 5631d206fbb..b9c6a1eefd9 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -23561,6 +23561,7 @@ CREATE TABLE user_preferences (
     pass_user_identities_to_ci_jwt boolean DEFAULT false NOT NULL,
     enabled_following boolean DEFAULT true NOT NULL,
     visibility_pipeline_id_type smallint DEFAULT 0 NOT NULL,
+    project_shortcut_buttons boolean DEFAULT true NOT NULL,
     CONSTRAINT check_89bf269f41 CHECK ((char_length(diffs_deletion_color) <= 7)),
     CONSTRAINT check_d07ccd35f7 CHECK ((char_length(diffs_addition_color) <= 7))
 );