diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-12 21:12:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-12 21:12:20 +0300 |
| commit | 60aef5496ecea447e860786fe391eb45d2cf61e5 (patch) | |
| tree | a20fdcc01a8d384e8b6d9c9cc6f58ad3177070d7 /db | |
| parent | 76cbe9e688549d47b0055573380b908cf9a72ed1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20211110100050_add_has_shimo_to_project_settings.rb | 9 | ||||
| -rw-r--r-- | db/schema_migrations/20211110100050 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/db/migrate/20211110100050_add_has_shimo_to_project_settings.rb b/db/migrate/20211110100050_add_has_shimo_to_project_settings.rb new file mode 100644 index 00000000000..01507908e0f --- /dev/null +++ b/db/migrate/20211110100050_add_has_shimo_to_project_settings.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddHasShimoToProjectSettings < Gitlab::Database::Migration[1.0] + enable_lock_retries! + + def change + add_column :project_settings, :has_shimo, :boolean, default: false, null: false + end +end diff --git a/db/schema_migrations/20211110100050 b/db/schema_migrations/20211110100050 new file mode 100644 index 00000000000..eed0afbac1c --- /dev/null +++ b/db/schema_migrations/20211110100050 @@ -0,0 +1 @@ +54b83ba1f8e8aa8a23f230664bcd6cc068a2df2d669e395713f0805d0f054f9c
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index e0efa8b9c39..13e7848a190 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -18302,6 +18302,7 @@ CREATE TABLE project_settings ( previous_default_branch text, warn_about_potentially_unwanted_characters boolean DEFAULT true NOT NULL, merge_commit_template text, + has_shimo boolean DEFAULT false NOT NULL, CONSTRAINT check_3a03e7557a CHECK ((char_length(previous_default_branch) <= 4096)), CONSTRAINT check_bde223416c CHECK ((show_default_award_emojis IS NOT NULL)), CONSTRAINT check_eaf7cfb6a7 CHECK ((char_length(merge_commit_template) <= 500)) |