diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-24 11:11:32 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-24 11:11:32 +0000 |
commit | 5d7884df60facff5f91b577fdd6c0b9149d7266b (patch) | |
tree | 5c9220e251ceaeaa6b7c00b1c38b86ed3a1fde75 /app/views | |
parent | 592f66868ad1e661cef394bb9f9bae2432f1cad4 (diff) | |
parent | 21fc25fd8efc6fc1196fd26d59f5b5e776240e83 (diff) | |
download | gitlab-ci-5d7884df60facff5f91b577fdd6c0b9149d7266b.tar.gz |
Merge branch 'cancel_commit' into 'master'
Ability to cancel all builds in the commit at once
https://dev.gitlab.org/gitlab/gitlab-ci/issues/289
![joxi_screenshot_1435066221235](https://gitlab.com/gitlab-org/gitlab-ci/uploads/c7a74956d05a86f40097c64ce5b2b2c3/joxi_screenshot_1435066221235.png)
See merge request !160
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/commits/show.html.haml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml index 9ca6222..76b491f 100644 --- a/app/views/commits/show.html.haml +++ b/app/views/commits/show.html.haml @@ -33,6 +33,12 @@ %span.attr-name Created at: #{@commit.created_at.to_s(:short)} +- if current_user && current_user.has_developer_access?(@project.gitlab_id) + .pull-right + - if @commit.builds.running_or_pending.any? + = link_to "Cancel", cancel_project_ref_commit_path(@project, @commit.ref, @commit.sha), class: 'btn btn-sm btn-danger' + + - if @commit.yaml_errors.present? .bs-callout.bs-callout-danger %h4 Found errors in your .gitlab-ci.yml: |