Commit f13ec30d authored by Stan Hu's avatar Stan Hu

Merge branch 'pipeline-labels' into 'master'

Fix tooltip titles for pipeline flags

See merge request gitlab-org/gitlab-ce!24027
parents 50beedb3 0f74f6dd
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
v-if="pipeline.flags.latest" v-if="pipeline.flags.latest"
v-gl-tooltip v-gl-tooltip
class="js-pipeline-url-latest badge badge-success" class="js-pipeline-url-latest badge badge-success"
title="__('Latest pipeline for this branch')" :title="__('Latest pipeline for this branch')"
> >
latest latest
</span> </span>
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
<span <span
v-if="pipeline.flags.merge_request" v-if="pipeline.flags.merge_request"
v-gl-tooltip v-gl-tooltip
title="__('This pipeline is run in a merge request context')" :title="__('This pipeline is run in a merge request context')"
class="js-pipeline-url-mergerequest badge badge-info" class="js-pipeline-url-mergerequest badge badge-info"
> >
merge request merge request
......
...@@ -6821,6 +6821,9 @@ msgstr "" ...@@ -6821,6 +6821,9 @@ msgstr ""
msgid "This page will be removed in a future release." msgid "This page will be removed in a future release."
msgstr "" msgstr ""
msgid "This pipeline is run in a merge request context"
msgstr ""
msgid "This pipeline makes use of a predefined CI/CD configuration enabled by <b>Auto DevOps.</b>" msgid "This pipeline makes use of a predefined CI/CD configuration enabled by <b>Auto DevOps.</b>"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment