Add latest changes from gitlab-org/gitlab@master

3 files changed, 11 insertions, 0 deletions

diff --git a/db/migrate/20230524142655_add_enabled_zoekt_to_user_preferences.rb b/db/migrate/20230524142655_add_enabled_zoekt_to_user_preferences.rb
new file mode 100644
index 00000000000..b92f424d5e1
--- /dev/null
+++ b/db/migrate/20230524142655_add_enabled_zoekt_to_user_preferences.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddEnabledZoektToUserPreferences < Gitlab::Database::Migration[2.1]
+  enable_lock_retries!
+
+  def change
+    add_column :user_preferences, :enabled_zoekt, :boolean, null: false, default: true
+  end
+end
diff --git a/db/schema_migrations/20230524142655 b/db/schema_migrations/20230524142655
new file mode 100644
index 00000000000..35aa474f5dd
--- /dev/null
+++ b/db/schema_migrations/20230524142655
@@ -0,0 +1 @@
+81f0d62ff5c06d5c34984dae613535d7ffbe9f0f3b25d2a694c5607e5e590805
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index cd092431559..41be6b40f1c 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -23749,6 +23749,7 @@ CREATE TABLE user_preferences (
     enabled_following boolean DEFAULT true NOT NULL,
     visibility_pipeline_id_type smallint DEFAULT 0 NOT NULL,
     project_shortcut_buttons boolean DEFAULT true NOT NULL,
+    enabled_zoekt 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))
 );