From 9f46488805e86b1bc341ea1620b866016c2ce5ed Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 20 May 2020 14:34:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-0-stable-ee --- db/migrate/20200224163804_add_version_to_feature_flags_table.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'db/migrate/20200224163804_add_version_to_feature_flags_table.rb') diff --git a/db/migrate/20200224163804_add_version_to_feature_flags_table.rb b/db/migrate/20200224163804_add_version_to_feature_flags_table.rb index bf3179f070c..d300f7c83e1 100644 --- a/db/migrate/20200224163804_add_version_to_feature_flags_table.rb +++ b/db/migrate/20200224163804_add_version_to_feature_flags_table.rb @@ -12,7 +12,9 @@ class AddVersionToFeatureFlagsTable < ActiveRecord::Migration[6.0] def up # The operations_feature_flags table is small enough that we can disable this cop. # See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25552#note_291202882 + # rubocop:disable Migration/AddColumnWithDefault add_column_with_default(:operations_feature_flags, :version, :smallint, default: FEATURE_FLAG_LEGACY_VERSION, allow_null: false) + # rubocop:enable Migration/AddColumnWithDefault end def down -- cgit v1.2.1