Resolve conflicts

ff1d435d · Kamil Trzciński · 2969b2a8 · ff1d435d · ff1d435d
Commit ff1d435d authored May 09, 2018 by Kamil Trzciński
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 11 deletions

app/models/project.rb app/models/project.rb +0 -8

app/presenters/ci/pipeline_presenter.rb app/presenters/ci/pipeline_presenter.rb +0 -3

No files found.
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -680,19 +680,11 @@ class Project < ActiveRecord::Base

    if persisted?
      create_import_state(import_state_args)
-<<<<<<< HEAD

      update_column(:import_status, 'none')
    else
      build_import_state(import_state_args)

-=======
-
-      update_column(:import_status, 'none')
-    else
-      build_import_state(import_state_args)
-
->>>>>>> upstream/master
      self[:import_status] = 'none'
    end
  end

--- a/app/presenters/ci/pipeline_presenter.rb
+++ b/app/presenters/ci/pipeline_presenter.rb
 module Ci
  class PipelinePresenter < Gitlab::View::Presenter::Delegated
-<<<<<<< HEAD
    prepend ::EE::Ci::PipelinePresenter
-=======
->>>>>>> upstream/master
    include Gitlab::Utils::StrongMemoize

    FAILURE_REASONS = {