Merge branch 'sh-promote-remove-migration' into 'master'

Re-add ignore_column for import columns

See merge request gitlab-org/gitlab-ce!29959

(cherry picked from commit 771e3903)

951a3bab Re-add ignore_column for import columns

app/models/project.rb

@@ -55,6 +55,8 @@ class Project < ApplicationRecord
   VALID_MIRROR_PORTS = [22, 80, 443].freeze
   VALID_MIRROR_PROTOCOLS = %w(http https ssh git).freeze
+  ignore_column :import_status, :import_jid, :import_error
+
   cache_markdown_field :description, pipeline: :description
   delegate :feature_available?, :builds_enabled?, :wiki_enabled?,