diff options
| author | James Lopez <james@jameslopez.es> | 2016-08-30 10:09:41 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-09-19 09:18:37 +0200 |
| commit | e74b7d665b80525c894bd3743ed7c4dc8810b4af (patch) | |
| tree | 5950bad0ddb51656a8189c8f2668f97cee8ee23d /app | |
| parent | 1d51bc7dfd04886fa5af69a60bb509691d697813 (diff) | |
| download | gitlab-ce-e74b7d665b80525c894bd3743ed7c4dc8810b4af.tar.gz | |
squashed - Fix DB exceptions raised importing some specific projects.
Better import of labels, milestones and protected branches. Updated relevant specs.
Loose pipeline validation on importing, so it does not fail when there are missing fields, which are not validated at DB level. Also, updated spec with relevant test.
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/pipeline.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 0b1df9f4294..70647b8532b 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -2,6 +2,7 @@ module Ci class Pipeline < ActiveRecord::Base extend Ci::Model include HasStatus + include Importable self.table_name = 'ci_commits' @@ -12,12 +13,12 @@ module Ci has_many :builds, class_name: 'Ci::Build', foreign_key: :commit_id has_many :trigger_requests, dependent: :destroy, class_name: 'Ci::TriggerRequest', foreign_key: :commit_id - validates_presence_of :sha - validates_presence_of :ref - validates_presence_of :status - validate :valid_commit_sha + validates_presence_of :sha, unless: :importing? + validates_presence_of :ref, unless: :importing? + validates_presence_of :status, unless: :importing? + validate :valid_commit_sha, unless: :importing? - after_save :keep_around_commits + after_save :keep_around_commits, unless: :importing? delegate :stages, to: :statuses |