diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-06-24 01:37:36 +0000 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-06-24 01:37:36 +0000 |
| commit | 771e390351ac64e261218c502fe60edea7ab2100 (patch) | |
| tree | 126311c44a93db658ee7fce0fce4dc39479a978b | |
| parent | 6875796c95471c7706b25a142b1eb815ef3d2ad1 (diff) | |
| parent | 951a3bab34bbbb4c02a0da0a363588111b94f212 (diff) | |
| download | gitlab-ce-771e390351ac64e261218c502fe60edea7ab2100.tar.gz | |
Merge branch 'sh-promote-remove-migration' into 'master'
Re-add ignore_column for import columns
See merge request gitlab-org/gitlab-ce!29959
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 7851f37116c..351d08eaf63 100644 --- a/app/models/project.rb +++ b/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?, |