From 7fcda12793acc54ba8de037f50cc3696dbd0f002 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 3 Mar 2021 15:10:53 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 ...roxy_allowlist_rename_on_application_settings.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 db/post_migrate/20210301200959_clean_up_asset_proxy_allowlist_rename_on_application_settings.rb

(limited to 'db/post_migrate')

diff --git a/db/post_migrate/20210301200959_clean_up_asset_proxy_allowlist_rename_on_application_settings.rb b/db/post_migrate/20210301200959_clean_up_asset_proxy_allowlist_rename_on_application_settings.rb
new file mode 100644
index 00000000000..d0b372b84f0
--- /dev/null
+++ b/db/post_migrate/20210301200959_clean_up_asset_proxy_allowlist_rename_on_application_settings.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class CleanUpAssetProxyAllowlistRenameOnApplicationSettings < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers::V2
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    cleanup_concurrent_column_rename :application_settings,
+      :asset_proxy_allowlist,
+      :asset_proxy_whitelist
+  end
+
+  def down
+    undo_cleanup_concurrent_column_rename :application_settings,
+      :asset_proxy_allowlist,
+      :asset_proxy_whitelist
+  end
+end
-- 
cgit v1.2.1