Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 0 deletions

diff --git a/db/migrate/20191119220425_rename_software_license_policies_approval_status_to_classification.rb b/db/migrate/20191119220425_rename_software_license_policies_approval_status_to_classification.rb
new file mode 100644
index 00000000000..98c14f42558
--- /dev/null
+++ b/db/migrate/20191119220425_rename_software_license_policies_approval_status_to_classification.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class RenameSoftwareLicensePoliciesApprovalStatusToClassification < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    rename_column_concurrently :software_license_policies, :approval_status, :classification
+  end
+
+  def down
+    undo_rename_column_concurrently :software_license_policies, :approval_status, :classification
+  end
+end