diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-03-01 15:35:39 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-03-01 15:35:39 +0000 |
| commit | d412b90af0ff59c6c379fb83727cc23043c42cdc (patch) | |
| tree | d5d1cb812d1c862c5338c776367f845fa47dbf4f | |
| parent | 0f721fe30b3abc35b4fbea668acf10e5d49fbe86 (diff) | |
| parent | 4edff2ae9289a91b5071497bb5532407b691be94 (diff) | |
| download | gitlab-ce-d412b90af0ff59c6c379fb83727cc23043c42cdc.tar.gz | |
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
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines_table_row.vue | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/42946-update-pipeline-cancel-tooltip-to-stop.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue index 2ba59051773..4cbd67e0372 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue @@ -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" diff --git a/changelogs/unreleased/42946-update-pipeline-cancel-tooltip-to-stop.yml b/changelogs/unreleased/42946-update-pipeline-cancel-tooltip-to-stop.yml new file mode 100644 index 00000000000..0e566dd0abf --- /dev/null +++ b/changelogs/unreleased/42946-update-pipeline-cancel-tooltip-to-stop.yml @@ -0,0 +1,5 @@ +--- +title: Update tooltip on pipeline cancel to Stop (#42946) +merge_request: 17444 +author: +type: fixed |