diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-27 16:46:52 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-12-27 16:46:52 +0000 |
| commit | f13ec30d5e0079d66efadd374b219d0c445e28cf (patch) | |
| tree | e5fa511768a6acd252a8b1601a9d50b9c75fff49 | |
| parent | 50beedb33f0506cf63dbd4077ec3943a684b70b1 (diff) | |
| parent | 0f74f6dd45d299b8307565ec12e45bde6c1e959b (diff) | |
| download | gitlab-ce-f13ec30d5e0079d66efadd374b219d0c445e28cf.tar.gz | |
Merge branch 'pipeline-labels' into 'master'
Fix tooltip titles for pipeline flags
See merge request gitlab-org/gitlab-ce!24027
| -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 b27efe04966..cf7b52bc16c 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -6821,6 +6821,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 "" |