diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-27 16:46:52 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-01-02 17:37:17 +0000 |
| commit | 9863253a87a196d1d2334a5ca391291c69c2c658 (patch) | |
| tree | c6e4aa386ad46e4aa3b60b1b6b72293dbba8b63d | |
| parent | 1614d503c1d4998f1f83bdb52d155526fbe6f25c (diff) | |
| download | gitlab-ce-9863253a87a196d1d2334a5ca391291c69c2c658.tar.gz | |
Merge branch 'pipeline-labels' into 'master'
Fix tooltip titles for pipeline flags
See merge request gitlab-org/gitlab-ce!24027
(cherry picked from commit f13ec30d5e0079d66efadd374b219d0c445e28cf)
0f74f6dd Added missing colons near titles.
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipeline_url.vue | 4 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipeline_url.vue b/app/assets/javascripts/pipelines/components/pipeline_url.vue index 30a5bbf92ce..7d8863dff29 100644 --- a/app/assets/javascripts/pipelines/components/pipeline_url.vue +++ b/app/assets/javascripts/pipelines/components/pipeline_url.vue @@ -65,7 +65,7 @@ export default { v-if="pipeline.flags.latest" v-gl-tooltip class="js-pipeline-url-latest badge badge-success" - title="__('Latest pipeline for this branch')" + :title="__('Latest pipeline for this branch')" > latest </span> @@ -100,7 +100,7 @@ export default { <span v-if="pipeline.flags.merge_request" 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" > merge request diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 48a8bb391f5..54e916e8df6 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -6740,6 +6740,9 @@ msgstr "" msgid "This page will be removed in a future release." 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>" msgstr "" |