summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-06-23 15:54:04 -0700
committerStan Hu <stanhu@gmail.com>2019-09-17 17:36:57 -0700
commit55bdab492e742c2d0390c764f45d84c7fb616966 (patch)
tree0b987795dee07248f46a67d13e4eefd3c460c08b
parent0dbd7139caefb94eac3cc51beac53453663b04c2 (diff)
downloadgitlab-ce-sh-fix-no-downtime-upgrades-ce.tar.gz
Re-add ignore_column for import columnssh-fix-no-downtime-upgrades-ce
This `ignore_column` was present for a while but recently removed, but to ensure we don't get error 500s let's keep it for a while.
-rw-r--r--app/models/project.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 482215e841f..609c9d0821d 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -9,6 +9,7 @@ class Project < ApplicationRecord
include AccessRequestable
include Avatarable
include CacheMarkdownField
+ include IgnorableColumn
include Referable
include Sortable
include AfterCommitQueue
@@ -55,6 +56,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?,