diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-24 21:19:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-24 21:19:04 +0300 |
commit | 94ca43181461c52ca0381d414387b02e579dbc61 (patch) | |
tree | 0d73744d7a846e831f2350bf97aa14a4c2dc7d14 /app/assets/javascripts/pipelines | |
parent | c4b4a75c35cb2015c01ef0b60f8ad8baaaf889df (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipelines')
-rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue index 7c78abae77f..92ed361bcc9 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue @@ -248,11 +248,15 @@ export default { <gl-badge v-if="pipeline.flags.merge_train_pipeline" v-gl-tooltip - :title="__('This is a merge train pipeline')" + :title=" + s__( + 'Pipeline|This pipeline ran on the contents of this merge request combined with the contents of all other merge requests queued for merging into the target branch.', + ) + " variant="info" size="sm" data-testid="pipeline-url-train" - >{{ __('train') }}</gl-badge + >{{ s__('Pipeline|merge train') }}</gl-badge > <gl-badge v-if="pipeline.flags.yaml_errors" @@ -320,14 +324,14 @@ export default { v-if="pipeline.flags.detached_merge_request_pipeline" v-gl-tooltip :title=" - __( - 'Merge request pipelines are configured. A detached pipeline runs in the context of the merge request, and not against the merged result. Learn more in the documentation for merge request pipelines.', + s__( + `Pipeline|This pipeline ran on the contents of this merge request's source branch, not the target branch.`, ) " variant="info" size="sm" data-testid="pipeline-url-detached" - >{{ __('detached') }}</gl-badge + >{{ s__('Pipeline|merge request') }}</gl-badge > <gl-badge v-if="isInFork" |