diff options
| author | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-06-03 15:20:11 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-06-03 15:20:11 +0200 |
| commit | 9d491712cfe33286329524fb39dc5bf8e4c8affd (patch) | |
| tree | 0e99ae15e613d5971ba9e7c7ffcdd51e37a2f725 /app/views/projects/ci/commits/_commit.html.haml | |
| parent | fab695461afbc4d03fbbf8cfbf9c5d90760ce752 (diff) | |
| parent | ca3c5c295ed653b483fe81c3918ffe60f46666b9 (diff) | |
| download | gitlab-ce-awardables.tar.gz | |
Merge branch 'master' into awardablesawardables
Diffstat (limited to 'app/views/projects/ci/commits/_commit.html.haml')
| -rw-r--r-- | app/views/projects/ci/commits/_commit.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml index 5b6b940a0c4..5e3a4123a8e 100644 --- a/app/views/projects/ci/commits/_commit.html.haml +++ b/app/views/projects/ci/commits/_commit.html.haml @@ -63,9 +63,9 @@ %span #{build.name} - if can?(current_user, :update_pipeline, @project) - - if commit.retryable? && commit.builds.failed.any? + - if commit.retryable? = link_to retry_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn has-tooltip', title: "Retry", method: :post do = icon("repeat") - - if commit.active? + - if commit.cancelable? = link_to cancel_namespace_project_pipeline_path(@project.namespace, @project, commit.id), class: 'btn btn-remove has-tooltip', title: "Cancel", method: :post do = icon("remove") |