summaryrefslogtreecommitdiff
path: root/db/post_migrate
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-27 21:09:17 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-27 21:09:17 +0000
commitc77fda905a8619b756163c10a75171dc9cfe7084 (patch)
treeffa93b37bfe4b99ba0b8584c7a0bd1a4cd19772a /db/post_migrate
parente0fa0638a422c3e20d4423c9bb69d79afc9c7d3d (diff)
downloadgitlab-ce-c77fda905a8619b756163c10a75171dc9cfe7084.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db/post_migrate')
-rw-r--r--db/post_migrate/20200120083607_remove_storage_version_column_from_snippets.rb2
-rw-r--r--db/post_migrate/20200221142216_remove_repository_storage_from_snippets.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/db/post_migrate/20200120083607_remove_storage_version_column_from_snippets.rb b/db/post_migrate/20200120083607_remove_storage_version_column_from_snippets.rb
index 62bb3f46cae..e94dc75e65c 100644
--- a/db/post_migrate/20200120083607_remove_storage_version_column_from_snippets.rb
+++ b/db/post_migrate/20200120083607_remove_storage_version_column_from_snippets.rb
@@ -19,7 +19,7 @@ class RemoveStorageVersionColumnFromSnippets < ActiveRecord::Migration[5.2]
def down
return if column_exists?(:snippets, :storage_version)
- add_column_with_default( # rubocop:disable Migration/AddColumnWithDefault
+ add_column_with_default(
:snippets,
:storage_version,
:integer,
diff --git a/db/post_migrate/20200221142216_remove_repository_storage_from_snippets.rb b/db/post_migrate/20200221142216_remove_repository_storage_from_snippets.rb
index f9ef985218b..fb8721a45b8 100644
--- a/db/post_migrate/20200221142216_remove_repository_storage_from_snippets.rb
+++ b/db/post_migrate/20200221142216_remove_repository_storage_from_snippets.rb
@@ -16,7 +16,7 @@ class RemoveRepositoryStorageFromSnippets < ActiveRecord::Migration[6.0]
def down
return if column_exists?(:snippets, :repository_storage)
- add_column_with_default( # rubocop:disable Migration/AddColumnWithDefault
+ add_column_with_default(
:snippets,
:repository_storage,
:string,