diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 21:08:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 21:08:11 +0300 |
commit | 8a7efa45c38ed3200d173d2c3207a8154e583c16 (patch) | |
tree | 1bb4d579b95c79aae4946a06fefa089e5549b722 /db | |
parent | 53b1f4eaa2a451aaba908a5fee7ce97a930021ac (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20200331220930_enable_container_expiration_policies_by_default.rb | 19 | ||||
-rw-r--r-- | db/structure.sql | 3 |
2 files changed, 21 insertions, 1 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 diff --git a/db/structure.sql b/db/structure.sql index bbd6312b08a..0d25712e0b4 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1842,7 +1842,7 @@ CREATE TABLE public.container_expiration_policies ( cadence character varying(12) DEFAULT '7d'::character varying NOT NULL, older_than character varying(12), keep_n integer, - enabled boolean DEFAULT false NOT NULL + enabled boolean DEFAULT true NOT NULL ); CREATE TABLE public.container_repositories ( @@ -12926,5 +12926,6 @@ COPY "schema_migrations" (version) FROM STDIN; 20200326145443 20200330074719 20200330132913 +20200331220930 \. |