Resolve conflicts in Ci::Pipeline by moving the code to an EE module

app/models/ci/pipeline.rb

@@ -6,6 +6,8 @@ module Ci
     include AfterCommitQueue
     include Presentable
 
+    prepend ::EE::Ci::Pipeline
+
     belongs_to :project
     belongs_to :user
     belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline'
@@ -403,11 +405,7 @@ module Ci
     def predefined_variables
       [
         { key: 'CI_PIPELINE_ID', value: id.to_s, public: true },
-<<<<<<< HEAD
-        { key: 'CI_PIPELINE_SOURCE', value: source.to_s, public: true }
-=======
         { key: 'CI_CONFIG_PATH', value: ci_yaml_file_path, public: true }
->>>>>>> ce/master
       ]
     end
 

app/models/ee/ci/pipeline.rb

+module EE
+  module Ci
+    module Pipeline
+      def predefined_variables
+        result = super
+        result << { key: 'CI_PIPELINE_SOURCE', value: source.to_s, public: true }
+
+        result
+      end
+    end
+  end
+end