Merge branch '62137-add-tooltip-to-improve-clarity-of-detached-label-state-in-the-merge-request-pipeline' into 'master'

Resolve "Add tooltip to improve clarity of "detached" label/state in the merge request pipeline"

Closes #62137

See merge request gitlab-org/gitlab-ce!31626
This commit is contained in:
Clement Ho 2019-08-09 15:37:14 +00:00
commit cdf347bf5e
4 changed files with 14 additions and 5 deletions

View file

@ -102,7 +102,11 @@ export default {
<span
v-if="pipeline.flags.detached_merge_request_pipeline"
v-gl-tooltip
:title="__('This pipeline is run on the source branch')"
:title="
__(
'The code of a detached pipeline is tested against the source branch instead of merged results',
)
"
class="js-pipeline-url-detached badge badge-info"
>
{{ __('detached') }}

View file

@ -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 run on the source branch" }
%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

View file

@ -0,0 +1,5 @@
---
title: Updated the detached pipeline badge tooltip text to offer a better explanation
merge_request: 31626
author:
type: other

View file

@ -10888,6 +10888,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 ""
@ -11383,9 +11386,6 @@ msgstr ""
msgid "This page will be removed in a future release."
msgstr ""
msgid "This pipeline is run on the source branch"
msgstr ""
msgid "This pipeline makes use of a predefined CI/CD configuration enabled by %{strongStart}Auto DevOps.%{strongEnd}"
msgstr ""