kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Clement Ho 2019-08-19 20:05:34 +00:00
parent 50ff074e79 a59c9a137e
commit fede390ce8
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/pipelines/components/pipeline_url.vue
View File

@ -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"

2
app/views/projects/pipelines/_info.html.haml
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: "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

5
changelogs/unreleased/66061-update-tooltip-of-detached-label-state.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Updates tooltip of 'detached' label/state
merge_request:
author:
type: other

6
locale/gitlab.pot
View File

@ -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 ""