From f5050253469fc0961c02deec0e698ad62bdd9de5 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 8 Apr 2020 09:09:43 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 ...ble_historic_entries_to_application_settings.rb | 22 ++++++++++++++++++++++
 db/structure.sql                                   |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20200331195952_add_container_expiration_policies_enable_historic_entries_to_application_settings.rb

(limited to 'db')

diff --git a/db/migrate/20200331195952_add_container_expiration_policies_enable_historic_entries_to_application_settings.rb b/db/migrate/20200331195952_add_container_expiration_policies_enable_historic_entries_to_application_settings.rb
new file mode 100644
index 00000000000..95ce75efccc
--- /dev/null
+++ b/db/migrate/20200331195952_add_container_expiration_policies_enable_historic_entries_to_application_settings.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AddContainerExpirationPoliciesEnableHistoricEntriesToApplicationSettings < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default(:application_settings,
+                            :container_expiration_policies_enable_historic_entries,
+                            :boolean,
+                            default: false,
+                            allow_null: false)
+  end
+
+  def down
+    remove_column(:application_settings,
+                  :container_expiration_policies_enable_historic_entries)
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 6f3c271a0db..a284d001ee5 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -397,7 +397,8 @@ CREATE TABLE public.application_settings (
     email_restrictions text,
     npm_package_requests_forwarding boolean DEFAULT true NOT NULL,
     namespace_storage_size_limit bigint DEFAULT 0 NOT NULL,
-    seat_link_enabled boolean DEFAULT true NOT NULL
+    seat_link_enabled boolean DEFAULT true NOT NULL,
+    container_expiration_policies_enable_historic_entries boolean DEFAULT false NOT NULL
 );
 
 CREATE SEQUENCE public.application_settings_id_seq
@@ -13001,6 +13002,7 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200330121000
 20200330123739
 20200330132913
+20200331195952
 20200331220930
 20200402123926
 20200402135250
-- 
cgit v1.2.1