diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-24 12:09:10 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-24 12:09:10 +0000 |
| commit | c7864d3d50b4002c621c7cba2e1ebfb5d23ac7ed (patch) | |
| tree | 64dfce2dcf6b0f8c98ae118ffa1be7dbfc1a3478 /db | |
| parent | 38d4874ab934aa8ebc004b923cabcc981c0f3e7f (diff) | |
| download | gitlab-ce-c7864d3d50b4002c621c7cba2e1ebfb5d23ac7ed.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/post_migrate/20210823193234_remove_allow_editing_commit_messages_from_project_settings.rb | 17 | ||||
| -rw-r--r-- | db/schema_migrations/20210823193234 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 1 |
3 files changed, 1 insertions, 18 deletions
diff --git a/db/post_migrate/20210823193234_remove_allow_editing_commit_messages_from_project_settings.rb b/db/post_migrate/20210823193234_remove_allow_editing_commit_messages_from_project_settings.rb deleted file mode 100644 index 7806f05a9af..00000000000 --- a/db/post_migrate/20210823193234_remove_allow_editing_commit_messages_from_project_settings.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -class RemoveAllowEditingCommitMessagesFromProjectSettings < ActiveRecord::Migration[6.1] - include Gitlab::Database::MigrationHelpers - - def up - with_lock_retries do - remove_column :project_settings, :allow_editing_commit_messages - end - end - - def down - with_lock_retries do - add_column :project_settings, :allow_editing_commit_messages, :boolean, default: false, null: false - end - end -end diff --git a/db/schema_migrations/20210823193234 b/db/schema_migrations/20210823193234 deleted file mode 100644 index d47f1ec567a..00000000000 --- a/db/schema_migrations/20210823193234 +++ /dev/null @@ -1 +0,0 @@ -b85ef326056bb152d527e34b49caa3c40ee8685c3b14654992246c6adf082f8c
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 058a55d6251..163ac643a3d 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -17343,6 +17343,7 @@ CREATE TABLE project_settings ( squash_option smallint DEFAULT 3, has_confluence boolean DEFAULT false NOT NULL, has_vulnerabilities boolean DEFAULT false NOT NULL, + allow_editing_commit_messages boolean DEFAULT false NOT NULL, prevent_merge_without_jira_issue boolean DEFAULT false NOT NULL, cve_id_request_enabled boolean DEFAULT true NOT NULL, mr_default_target_self boolean DEFAULT false NOT NULL, |