Add latest changes from gitlab-org/gitlab@12-10-stable-ee

1 files changed, 19 insertions, 0 deletions

diff --git a/db/migrate/20200325104755_add_push_rules_id_to_project_settings.rb b/db/migrate/20200325104755_add_push_rules_id_to_project_settings.rb
new file mode 100644
index 00000000000..93de736436b
--- /dev/null
+++ b/db/migrate/20200325104755_add_push_rules_id_to_project_settings.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddPushRulesIdToProjectSettings < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    with_lock_retries do
+      add_column :project_settings, :push_rule_id, :bigint
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :project_settings, :push_rule_id
+    end
+  end
+end