Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-08 15:07:59 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-08 15:07:59 +0300
commite3e300557f5def9bf2271735c8a620e6820dfada (patch)
tree8d0d4590518ee17eb32956e35637e11a2b8ca561 /app/controllers/projects/pipelines_controller.rb
parenta821bd6ad17e304ca93838a411410a44ee9cff9f (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/pipelines_controller.rb')
-rw-r--r--app/controllers/projects/pipelines_controller.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index e3ef8f3f2ff..a62eb94a3e4 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -80,6 +80,12 @@ class Projects::PipelinesController < Projects::ApplicationController
end
end
+ def destroy
+ ::Ci::DestroyPipelineService.new(project, current_user).execute(pipeline)
+
+ redirect_to project_pipelines_path(project), status: :see_other
+ end
+
def builds
render_show
end