diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-08 03:11:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-08 03:11:45 +0300 |
commit | 6352d2f7c2a9e62e07f854861f9f57dacbd6f4a4 (patch) | |
tree | c2401747b66f1112bcb4d1cd50037562bbfb9dff /db | |
parent | 2cf4bdd0b060175c7058b395014b101fbe6214a3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/post_migrate/20231206200121_remove_use_legacy_web_ide_column.rb | 14 | ||||
-rw-r--r-- | db/schema_migrations/20231206200121 | 1 | ||||
-rw-r--r-- | db/structure.sql | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/db/post_migrate/20231206200121_remove_use_legacy_web_ide_column.rb b/db/post_migrate/20231206200121_remove_use_legacy_web_ide_column.rb new file mode 100644 index 00000000000..ca8d196a1a0 --- /dev/null +++ b/db/post_migrate/20231206200121_remove_use_legacy_web_ide_column.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +class RemoveUseLegacyWebIdeColumn < Gitlab::Database::Migration[2.2] + milestone '16.7' + enable_lock_retries! + + def up + remove_column :user_preferences, :use_legacy_web_ide + end + + def down + add_column :user_preferences, :use_legacy_web_ide, :boolean, default: false, null: false + end +end diff --git a/db/schema_migrations/20231206200121 b/db/schema_migrations/20231206200121 new file mode 100644 index 00000000000..4e36923ba99 --- /dev/null +++ b/db/schema_migrations/20231206200121 @@ -0,0 +1 @@ +f425d63a9d6a474162cb59cf0aea0d0d56cd38e30cb32fde8387ca9e247187c9
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index c3c25cfe267..dc6e8c4cef9 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -24653,7 +24653,6 @@ CREATE TABLE user_preferences ( diffs_deletion_color text, diffs_addition_color text, markdown_automatic_lists boolean DEFAULT true NOT NULL, - use_legacy_web_ide boolean DEFAULT false NOT NULL, use_new_navigation boolean, achievements_enabled boolean DEFAULT true NOT NULL, pinned_nav_items jsonb DEFAULT '{}'::jsonb NOT NULL, |