Merge branch 'fj-remove-repository-storage-column-from-snippets' into 'master'

Remove repository_storage column from snippets table

See merge request gitlab-org/gitlab!25699

app/models/snippet.rb

@@ -17,7 +17,7 @@ class Snippet < ApplicationRecord
   include HasRepository
   extend ::Gitlab::Utils::Override
 
-  ignore_column :repository_storage, remove_with: '12.10', remove_after: '2020-04-22'
+  ignore_column :repository_storage, remove_with: '12.10', remove_after: '2020-03-22'
 
   cache_markdown_field :title, pipeline: :single_line
   cache_markdown_field :description

changelogs/unreleased/fj-remove-repository-storage-column-from-snippets.yml

+---
+title: Remove repository_storage column from snippets
+merge_request: 25699
+author:
+type: other

db/post_migrate/20200221142216_remove_repository_storage_from_snippets.rb

+# frozen_string_literal: true
+
+class RemoveRepositoryStorageFromSnippets < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    return unless column_exists?(:snippets, :repository_storage)
+
+    remove_column :snippets, :repository_storage
+  end
+
+  def down
+    return if column_exists?(:snippets, :repository_storage)
+
+    add_column_with_default( # rubocop:disable Migration/AddColumnWithDefault
+      :snippets,
+      :repository_storage,
+      :string,
+      default: 'default',
+      limit: 255,
+      allow_null: false
+    )
+  end
+end

db/schema.rb

@@ -3939,7 +3939,6 @@ ActiveRecord::Schema.define(version: 2020_02_24_163804) do
     t.string "encrypted_secret_token", limit: 255
     t.string "encrypted_secret_token_iv", limit: 255
     t.boolean "secret", default: false, null: false
-    t.string "repository_storage", limit: 255, default: "default", null: false
     t.index ["author_id"], name: "index_snippets_on_author_id"
     t.index ["content"], name: "index_snippets_on_content_trigram", opclass: :gin_trgm_ops, using: :gin
     t.index ["created_at"], name: "index_snippets_on_created_at"

lib/gitlab/import_export/import_export.yml

@@ -173,7 +173,6 @@ excluded_attributes:
     - :secret
     - :encrypted_secret_token
     - :encrypted_secret_token_iv
-    - :repository_storage
   merge_request_diff:
     - :external_diff
     - :stored_externally