summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2019-06-20 08:31:07 +0000
committerDouwe Maan <douwe@gitlab.com>2019-06-20 08:31:07 +0000
commitef12d7adc4c3e06664c3b7324867f2472ae5be5b (patch)
tree0e16b0314d92a5ceb04fc3d396a83516128764ed /app
parent376f2c2a141cd3eaf5252c7fc4113aefa5e9ab45 (diff)
parent6c0bc9abdd2542cc0951bd34b150a5824b987636 (diff)
downloadgitlab-ce-ef12d7adc4c3e06664c3b7324867f2472ae5be5b.tar.gz
Merge branch 'sh-remove-import-columns-from-projects' into 'master'
Remove import columns from projects table See merge request gitlab-org/gitlab-ce!29863
Diffstat (limited to 'app')
-rw-r--r--app/models/project.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 351d08eaf63..7851f37116c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -55,8 +55,6 @@ 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?,