Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/app/serializers/pipeline_entity.rb b/app/serializers/pipeline_entity.rb
index 6b2a1bfe666..ba8f4fffe02 100644
--- a/app/serializers/pipeline_entity.rb
+++ b/app/serializers/pipeline_entity.rb
@@ -77,6 +77,10 @@ class PipelineEntity < Grape::Entity
     cancel_project_pipeline_path(pipeline.project, pipeline)
   end
 
+  expose :delete_path, if: -> (*) { can_delete? } do |pipeline|
+    project_pipeline_path(pipeline.project, pipeline)
+  end
+
   expose :failed_builds, if: -> (*) { can_retry? }, using: JobEntity do |pipeline|
     pipeline.failed_builds
   end
@@ -95,6 +99,10 @@ class PipelineEntity < Grape::Entity
       pipeline.cancelable?
   end
 
+  def can_delete?
+    can?(request.current_user, :destroy_pipeline, pipeline)
+  end
+
   def has_presentable_merge_request?
     pipeline.triggered_by_merge_request? &&
       can?(request.current_user, :read_merge_request, pipeline.merge_request)