Skip to content

G
gitlab-ce
Commit 9778b0d1 authored by Francisco Javier López's avatar Francisco Javier López
Browse files
Options

Update pipeline.rb

parent cf49dc01
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/models/ci/pipeline.rb
View file @ 9778b0d1
...@@ -12,11 +12,8 @@ module Ci ...@@ -12,11 +12,8 @@ module Ci
include AtomicInternalId include AtomicInternalId
include EnumWithNil include EnumWithNil
<<<<<<< HEAD
prepend ::EE::Ci::Pipeline prepend ::EE::Ci::Pipeline
=======
>>>>>>> upstream/master
belongs_to :project, inverse_of: :all_pipelines belongs_to :project, inverse_of: :all_pipelines
belongs_to :user belongs_to :user
belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline' belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7