Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 13 insertions, 0 deletions

diff --git a/db/migrate/20200708080631_add_pager_duty_integration_columns_to_project_incident_management_settings.rb b/db/migrate/20200708080631_add_pager_duty_integration_columns_to_project_incident_management_settings.rb
new file mode 100644
index 00000000000..ab56a863f51
--- /dev/null
+++ b/db/migrate/20200708080631_add_pager_duty_integration_columns_to_project_incident_management_settings.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddPagerDutyIntegrationColumnsToProjectIncidentManagementSettings < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  # limit constraints added in a separate migration:
+  # 20200710130234_add_limit_constraints_to_project_incident_management_settings_token.rb
+  def change
+    add_column :project_incident_management_settings, :pagerduty_active, :boolean, null: false, default: false
+    add_column :project_incident_management_settings, :encrypted_pagerduty_token, :binary, null: true
+    add_column :project_incident_management_settings, :encrypted_pagerduty_token_iv, :binary, null: true
+  end
+end