diff options
| author | Clement Ho <408677-ClemMakesApps@users.noreply.gitlab.com> | 2019-08-19 20:05:34 +0000 |
|---|---|---|
| committer | Clement Ho <408677-ClemMakesApps@users.noreply.gitlab.com> | 2019-08-19 20:05:34 +0000 |
| commit | fede390ce8a3edfae8dca04612d0039a4ed01572 (patch) | |
| tree | febd5c6fe62afbc935714bb33f0a7c1060b5284a /app | |
| parent | 50ff074e79a67a14abdd9f5fcce8d6c7729b179f (diff) | |
| parent | a59c9a137eb0a141bebdd0fffcb2e14fab54c4b5 (diff) | |
| download | gitlab-ce-fede390ce8a3edfae8dca04612d0039a4ed01572.tar.gz | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipeline_url.vue | 2 | ||||
| -rw-r--r-- | app/views/projects/pipelines/_info.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipeline_url.vue b/app/assets/javascripts/pipelines/components/pipeline_url.vue index e01080b04d6..4efc1d2408a 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=" __( - '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" diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index 2b56ada8b73..9614f33fe2f 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: "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 |