diff --git a/changelogs/unreleased/220934-confluence-wiki-db.yml b/changelogs/unreleased/220934-confluence-wiki-db.yml new file mode 100644 index 0000000000000000000000000000000000000000..6c2c8be64f28361df3c16435508b0af7d6f4e842 --- /dev/null +++ b/changelogs/unreleased/220934-confluence-wiki-db.yml @@ -0,0 +1,5 @@ +--- +title: Database migration to add project_settings.has_confluence +merge_request: 35485 +author: +type: other diff --git a/db/migrate/20200619000316_add_has_confluence_to_project_settings.rb b/db/migrate/20200619000316_add_has_confluence_to_project_settings.rb new file mode 100644 index 0000000000000000000000000000000000000000..0f33e0bc47ac9e5b148732cc80552a609202c84c --- /dev/null +++ b/db/migrate/20200619000316_add_has_confluence_to_project_settings.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class AddHasConfluenceToProjectSettings < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + with_lock_retries do + add_column :project_settings, :has_confluence, :boolean, default: false, null: false + end + end + + def down + with_lock_retries do + remove_column :project_settings, :has_confluence + end + end +end diff --git a/db/structure.sql b/db/structure.sql index e88a5f3333dc1debfc2ae8de56a76f05aa4898a1..527359959a2dddad65b102f0bc96f76e163df24a 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -14190,6 +14190,7 @@ CREATE TABLE public.project_settings ( show_default_award_emojis boolean DEFAULT true, allow_merge_on_skipped_pipeline boolean, squash_option smallint DEFAULT 3, + has_confluence boolean DEFAULT false NOT NULL, CONSTRAINT check_bde223416c CHECK ((show_default_award_emojis IS NOT NULL)) ); @@ -23515,6 +23516,7 @@ COPY "schema_migrations" (version) FROM STDIN; 20200618105638 20200618134223 20200618134723 +20200619000316 20200619154527 20200619154528 20200622040750 diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index 0d112bfdb2a20f65b87e017555ca2faa2ca074da..395eda1754f193aa7ecaa982e242c9ebe3e5e449 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -705,6 +705,7 @@ ProjectCiCdSetting: - group_runners_enabled ProjectSetting: - allow_merge_on_skipped_pipeline +- has_confluence ProtectedEnvironment: - id - project_id