summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordimitrieh <dimitriehoekstra@gmail.com>2017-02-20 12:20:49 +0100
committerdimitrieh <dimitriehoekstra@gmail.com>2017-02-20 12:20:49 +0100
commitcd04235efe4dd20accc9c7e1567fe5ccf95f7780 (patch)
treea30d1e7140599134b89f4ca15ffcc44b535c64f3
parentf8a736d028c09927454c86a9e192dadc6d1e2600 (diff)
downloadgitlab-ce-cd04235efe4dd20accc9c7e1567fe5ccf95f7780.tar.gz
Rename retry failed button on pipeline page to just retry
-rw-r--r--app/views/projects/pipelines/_info.html.haml2
-rw-r--r--changelogs/unreleased/rename-retry-failed-pipeline-to-retry.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml
index e0c972aa2fb..59e50d25460 100644
--- a/app/views/projects/pipelines/_info.html.haml
+++ b/app/views/projects/pipelines/_info.html.haml
@@ -8,7 +8,7 @@
.header-action-buttons
- if can?(current_user, :update_pipeline, @pipeline.project)
- if @pipeline.retryable?
- = link_to "Retry failed", retry_namespace_project_pipeline_path(@pipeline.project.namespace, @pipeline.project, @pipeline.id), class: 'btn btn-inverted-secondary', method: :post
+ = link_to "Retry", retry_namespace_project_pipeline_path(@pipeline.project.namespace, @pipeline.project, @pipeline.id), class: 'btn btn-inverted-secondary', method: :post
- if @pipeline.cancelable?
= link_to "Cancel running", cancel_namespace_project_pipeline_path(@pipeline.project.namespace, @pipeline.project, @pipeline.id), data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
diff --git a/changelogs/unreleased/rename-retry-failed-pipeline-to-retry.yml b/changelogs/unreleased/rename-retry-failed-pipeline-to-retry.yml
new file mode 100644
index 00000000000..b813127b1e6
--- /dev/null
+++ b/changelogs/unreleased/rename-retry-failed-pipeline-to-retry.yml
@@ -0,0 +1,4 @@
+---
+title: Rename retry failed button on pipeline page to just retry
+merge_request:
+author: