Add latest changes from gitlab-org/gitlab@master

1 files changed, 19 insertions, 0 deletions

diff --git a/db/migrate/20200331220930_enable_container_expiration_policies_by_default.rb b/db/migrate/20200331220930_enable_container_expiration_policies_by_default.rb
new file mode 100644
index 00000000000..46393416eb7
--- /dev/null
+++ b/db/migrate/20200331220930_enable_container_expiration_policies_by_default.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class EnableContainerExpirationPoliciesByDefault < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    with_lock_retries do
+      change_column_default :container_expiration_policies, :enabled, true
+    end
+  end
+
+  def down
+    with_lock_retries do
+      change_column_default :container_expiration_policies, :enabled, false
+    end
+  end
+end