Fix merge conflicts in ExpirePipelineCacheWorker

app/workers/expire_pipeline_cache_worker.rb

@@ -10,17 +10,18 @@ class ExpirePipelineCacheWorker
     store = Gitlab::EtagCaching::Store.new
 
     store.touch(project_pipelines_path(project))
-    store.touch(project_pipeline_path(pipeline))
+    store.touch(project_pipeline_path(project, pipeline))
     store.touch(commit_pipelines_path(project, pipeline.commit)) if pipeline.commit
     store.touch(new_merge_request_pipelines_path(project))
     each_pipelines_merge_request_path(project, pipeline) do |path|
       store.touch(path)
     end
 
-    store.touch(project_pipeline_path(pipeline.triggered_by_pipeline)) if pipeline.triggered_by_pipeline
+    triggered_by = pipeline.triggered_by_pipeline
+    store.touch(project_pipeline_path(triggered_by.project, triggered_by)) if triggered_by
 
     pipeline.triggered_pipelines.each do |triggered|
-      store.touch(project_pipeline_path(triggered))
+      store.touch(project_pipeline_path(triggered.project, triggered))
     end
 
     Gitlab::Cache::Ci::ProjectPipelineStatus.update_for_pipeline(pipeline)
@@ -32,13 +33,8 @@ class ExpirePipelineCacheWorker
     Gitlab::Routing.url_helpers.project_pipelines_path(project, format: :json)
   end
 
-<<<<<<< HEAD
-  def project_pipeline_path(pipeline)
-    Gitlab::Routing.url_helpers.project_pipeline_path(pipeline.project, pipeline, format: :json)
-=======
   def project_pipeline_path(project, pipeline)
     Gitlab::Routing.url_helpers.project_pipeline_path(project, pipeline, format: :json)
->>>>>>> ce/master
   end
 
   def commit_pipelines_path(project, commit)