Merge branch 'revert-9d135aa7' into 'master'

Revert "Merge branch 'fj-remove-storage-version-from-snippets' into 'master'"

See merge request gitlab-org/gitlab!23158

changelogs/unreleased/fj-remove-storage-version-from-snippets.yml

----
-title: Remove storage_version column from snippets
-merge_request: 23004
-author:
-type: changed

db/post_migrate/20200114180546_remove_storage_version_column_from_snippets.rb

-# frozen_string_literal: true
-
-class RemoveStorageVersionColumnFromSnippets < ActiveRecord::Migration[5.2]
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-
-  disable_ddl_transaction!
-
-  def up
-    return unless column_exists?(:snippets, :storage_version)
-
-    remove_column :snippets, :storage_version
-  end
-
-  def down
-    add_column_with_default( # rubocop:disable Migration/AddColumnWithDefault
-      :snippets,
-      :storage_version,
-      :integer,
-      default: 2,
-      allow_null: false
-    )
-  end
-end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_01_14_180546) do
+ActiveRecord::Schema.define(version: 2020_01_14_113341) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"
@@ -3836,6 +3836,7 @@ ActiveRecord::Schema.define(version: 2020_01_14_180546) do
     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.integer "storage_version", default: 2, 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"