Merge branch 'revert-d5678c86' into 'master'

Revert "Merge branch 'mc-remove-column-from-project-settings' into 'master'"

See merge request gitlab-org/gitlab!68832

db/post_migrate/20210823193234_remove_allow_editing_commit_messages_from_project_settings.rb

-# 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

db/schema_migrations/20210823193234

-b85ef326056bb152d527e34b49caa3c40ee8685c3b14654992246c6adf082f8c
\ No newline at end of file

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,