Commit de430fa1 authored by Tiger Watson's avatar Tiger Watson

Merge branch '220934-confluence-wiki-db' into 'master'

Database migration for caching has_confluence on project_settings

See merge request gitlab-org/gitlab!35485
parents bfcefdf6 b5be6e07
---
title: Database migration to add project_settings.has_confluence
merge_request: 35485
author:
type: other
# 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
...@@ -14191,6 +14191,7 @@ CREATE TABLE public.project_settings ( ...@@ -14191,6 +14191,7 @@ CREATE TABLE public.project_settings (
show_default_award_emojis boolean DEFAULT true, show_default_award_emojis boolean DEFAULT true,
allow_merge_on_skipped_pipeline boolean, allow_merge_on_skipped_pipeline boolean,
squash_option smallint DEFAULT 3, squash_option smallint DEFAULT 3,
has_confluence boolean DEFAULT false NOT NULL,
CONSTRAINT check_bde223416c CHECK ((show_default_award_emojis IS NOT NULL)) CONSTRAINT check_bde223416c CHECK ((show_default_award_emojis IS NOT NULL))
); );
...@@ -23517,6 +23518,7 @@ COPY "schema_migrations" (version) FROM STDIN; ...@@ -23517,6 +23518,7 @@ COPY "schema_migrations" (version) FROM STDIN;
20200618105638 20200618105638
20200618134223 20200618134223
20200618134723 20200618134723
20200619000316
20200619154527 20200619154527
20200619154528 20200619154528
20200622040750 20200622040750
......
...@@ -705,6 +705,7 @@ ProjectCiCdSetting: ...@@ -705,6 +705,7 @@ ProjectCiCdSetting:
- group_runners_enabled - group_runners_enabled
ProjectSetting: ProjectSetting:
- allow_merge_on_skipped_pipeline - allow_merge_on_skipped_pipeline
- has_confluence
ProtectedEnvironment: ProtectedEnvironment:
- id - id
- project_id - project_id
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment