Merge branch '42946-update-pipeline-cancel-tooltip-to-stop' into 'master'

Resolve "Tooltip for the stop pipeline button is 'Cancel'"

Closes #42946

See merge request gitlab-org/gitlab-ce!17444
This commit is contained in:
Filipa Lacerda 2018-03-01 15:35:39 +00:00
commit d412b90af0
2 changed files with 6 additions and 1 deletions

View file

@ -316,7 +316,7 @@
v-if="pipeline.flags.cancelable"
:endpoint="pipeline.cancel_path"
css-class="js-pipelines-cancel-button btn-remove"
title="Cancel"
title="Stop"
icon="close"
:pipeline-id="pipeline.id"
data-toggle="modal"

View file

@ -0,0 +1,5 @@
---
title: Update tooltip on pipeline cancel to Stop (#42946)
merge_request: 17444
author:
type: fixed