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

1 files changed, 27 insertions, 0 deletions

diff --git a/db/post_migrate/20200408132152_remove_namespaces_trial_ends_on.rb b/db/post_migrate/20200408132152_remove_namespaces_trial_ends_on.rb
new file mode 100644
index 00000000000..cfe0daaf50f
--- /dev/null
+++ b/db/post_migrate/20200408132152_remove_namespaces_trial_ends_on.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class RemoveNamespacesTrialEndsOn < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    remove_concurrent_index_by_name :namespaces, 'index_namespaces_on_trial_ends_on'
+
+    with_lock_retries do
+      remove_column :namespaces, :trial_ends_on
+    end
+  end
+
+  def down
+    unless column_exists?(:namespaces, :trial_ends_on)
+      with_lock_retries do
+        add_column :namespaces, :trial_ends_on, :datetime_with_timezone
+      end
+    end
+
+    add_concurrent_index :namespaces, :trial_ends_on, using: 'btree', where: 'trial_ends_on IS NOT NULL'
+  end
+end