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

Merge branch '42946-update-pipeline-cancel-tooltip-to-stop' into 'master'
d412b90a · Filipa Lacerda · 0f721fe3 · 4edff2ae · d412b90a · d412b90a
Commit d412b90a authored Mar 01, 2018 by Filipa Lacerda
Showing with 6 additions and 1 deletion

pipelines_table_row.vue .../javascripts/pipelines/components/pipelines_table_row.vue +1 -1

42946-update-pipeline-cancel-tooltip-to-stop.yml ...released/42946-update-pipeline-cancel-tooltip-to-stop.yml +5 -0

No files found.
--- 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"

--- a/changelogs/unreleased/42946-update-pipeline-cancel-tooltip-to-stop.yml
+++ b/changelogs/unreleased/42946-update-pipeline-cancel-tooltip-to-stop.yml
+---
+title: Update tooltip on pipeline cancel to Stop (#42946)
+merge_request: 17444
+author:
+type: fixed