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 0000000000000000000000000000000000000000..01507908e0fe333c29bae22699dcdb0588478092 --- /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 0000000000000000000000000000000000000000..eed0afbac1c67081fe5f05e2798e8a78fb6dceca --- /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 f74fa143972de1e57e3b225990f679d3afb842ff..6a6083bd7cfb31619d7e824c45758fa6ba9b5bd2 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -18301,6 +18301,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)) diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index 7aa21d7bc0f4a23aa2d8615f898207912f878be5..9daa3b32fd121f408220c853601a89c80b85fb4e 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -693,6 +693,7 @@ ProjectCiCdSetting: ProjectSetting: - allow_merge_on_skipped_pipeline - has_confluence +- has_shimo - has_vulnerabilities ProtectedEnvironment: - id diff --git a/spec/requests/api/project_attributes.yml b/spec/requests/api/project_attributes.yml index dd00d413664c9ddfc650a33d351d1ec2d48ee13a..01d2fb18f0043caee5f02c9583763cdb6f71a6a5 100644 --- a/spec/requests/api/project_attributes.yml +++ b/spec/requests/api/project_attributes.yml @@ -137,6 +137,7 @@ project_setting: unexposed_attributes: - created_at - has_confluence + - has_shimo - has_vulnerabilities - prevent_merge_without_jira_issue - warn_about_potentially_unwanted_characters