diff options
| author | Nick Kipling <nkipling@gitlab.com> | 2019-08-09 09:47:50 +0100 |
|---|---|---|
| committer | Nick Kipling <nkipling@gitlab.com> | 2019-08-09 09:47:50 +0100 |
| commit | f4dad482899fdcff70ea982a4a47ec89dad63b8c (patch) | |
| tree | 87bc8b0ebfdb1143dae233a977002b82a4b48590 | |
| parent | 96d08ed6c653879d7a1dbb88e4f374068a682bf7 (diff) | |
| download | gitlab-ce-62137-add-tooltip-to-improve-clarity-of-detached-label-state-in-the-merge-request-pipeline.tar.gz | |
Rewording tooltip as per review feedback62137-add-tooltip-to-improve-clarity-of-detached-label-state-in-the-merge-request-pipeline
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipeline_url.vue | 2 | ||||
| -rw-r--r-- | app/views/projects/pipelines/_info.html.haml | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipeline_url.vue b/app/assets/javascripts/pipelines/components/pipeline_url.vue index 8e41b295e64..e01080b04d6 100644 --- a/app/assets/javascripts/pipelines/components/pipeline_url.vue +++ b/app/assets/javascripts/pipelines/components/pipeline_url.vue @@ -104,7 +104,7 @@ export default { v-gl-tooltip :title=" __( - 'This pipeline is detached: The code is tested against the source branch instead of merged results', + 'The code of a detached pipeline is tested against the source branch instead of merged results', ) " class="js-pipeline-url-detached badge badge-info" diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index caac9d2f086..2b56ada8b73 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -43,7 +43,7 @@ } } Auto DevOps - if @pipeline.detached_merge_request_pipeline? - %span.js-pipeline-url-mergerequest.badge.badge-info.has-tooltip{ title: "This pipeline is detached: The code is tested against the source branch instead of merged results" } + %span.js-pipeline-url-mergerequest.badge.badge-info.has-tooltip{ title: "The code of a detached pipeline is tested against the source branch instead of merged results" } detached - if @pipeline.stuck? %span.js-pipeline-url-stuck.badge.badge-warning diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 83f1c5fcf40..101164bef2d 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -10879,6 +10879,9 @@ msgstr "" msgid "The character highlighter helps you keep the subject line to %{titleLength} characters and wrap the body at %{bodyLength} so they are readable in git." msgstr "" +msgid "The code of a detached pipeline is tested against the source branch instead of merged results" +msgstr "" + msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request." msgstr "" @@ -11377,9 +11380,6 @@ msgstr "" msgid "This page will be removed in a future release." msgstr "" -msgid "This pipeline is detached: The code is tested against the source branch instead of merged results" -msgstr "" - msgid "This pipeline makes use of a predefined CI/CD configuration enabled by %{strongStart}Auto DevOps.%{strongEnd}" msgstr "" |