Skip to content
Snippets Groups Projects
Commit fede390c authored by Clement Ho's avatar Clement Ho
Browse files

Merge branch '66061-update-tooltip-of-detached-label-state' into 'master'

Resolve "Update tooltip of "detached" label/state"

Closes #66061

See merge request gitlab-org/gitlab-ce!31917
parents 50ff074e a59c9a13
No related branches found
No related tags found
No related merge requests found
......@@ -104,7 +104,7 @@ export default {
v-gl-tooltip
:title="
__(
'The code of a detached pipeline is tested against the source branch instead of merged results',
'Pipelines for merge requests are configured. A detached pipeline runs in the context of the merge request, and not against the merged result. Learn more on the documentation for Pipelines for Merged Results.',
)
"
class="js-pipeline-url-detached badge badge-info"
......
......@@ -43,7 +43,7 @@
} }
Auto DevOps
- if @pipeline.detached_merge_request_pipeline?
%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" }
%span.js-pipeline-url-mergerequest.badge.badge-info.has-tooltip{ title: _('Pipelines for merge requests are configured. A detached pipeline runs in the context of the merge request, and not against the merged result. Learn more on the documentation for Pipelines for Merged Results.') }
detached
- if @pipeline.stuck?
%span.js-pipeline-url-stuck.badge.badge-warning
......
---
title: Updates tooltip of 'detached' label/state
merge_request:
author:
type: other
......@@ -8020,6 +8020,9 @@ msgstr ""
msgid "Pipelines for last year"
msgstr ""
msgid "Pipelines for merge requests are configured. A detached pipeline runs in the context of the merge request, and not against the merged result. Learn more on the documentation for Pipelines for Merged Results."
msgstr ""
msgid "Pipelines settings for '%{project_name}' were successfully updated."
msgstr ""
......@@ -11160,9 +11163,6 @@ 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 ""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment