Commit f2c7f3d0 authored by Fatih Acet's avatar Fatih Acet

Merge branch '55721-externalization-for-pipeline-tags' into 'master'

Externalization for pipeline tags

Closes #55721

See merge request gitlab-org/gitlab-ce!24028
parents 97bdac6b 53e18c5b
<script>
import { GlLink, GlTooltipDirective } from '@gitlab/ui';
import _ from 'underscore';
import { __, sprintf } from '~/locale';
import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
import popover from '~/vue_shared/directives/popover';
const popoverTitle = sprintf(
_.escape(
__(
`This pipeline makes use of a predefined CI/CD configuration enabled by %{strongStart}Auto DevOps.%{strongEnd}`,
),
),
{ strongStart: '<b>', strongEnd: '</b>' },
false,
);
export default {
components: {
UserAvatarLink,
......@@ -32,14 +44,14 @@ export default {
trigger: 'focus',
placement: 'top',
title: `<div class="autodevops-title">
This pipeline makes use of a predefined CI/CD configuration enabled by <b>Auto DevOps.</b>
${popoverTitle}
</div>`,
content: `<a
class="autodevops-link"
href="${this.autoDevopsHelpPath}"
target="_blank"
rel="noopener noreferrer nofollow">
Learn more about Auto DevOps
${_.escape(__('Learn more about Auto DevOps'))}
</a>`,
};
},
......@@ -54,9 +66,9 @@ export default {
<span>by</span>
<user-avatar-link
v-if="user"
:link-href="pipeline.user.path"
:img-src="pipeline.user.avatar_url"
:tooltip-text="pipeline.user.name"
:link-href="user.path"
:img-src="user.avatar_url"
:tooltip-text="user.name"
class="js-pipeline-url-user"
/>
<span v-if="!user" class="js-pipeline-url-api api"> API </span>
......@@ -64,10 +76,10 @@ export default {
<span
v-if="pipeline.flags.latest"
v-gl-tooltip
class="js-pipeline-url-latest badge badge-success"
:title="__('Latest pipeline for this branch')"
class="js-pipeline-url-latest badge badge-success"
>
latest
{{ __('latest') }}
</span>
<span
v-if="pipeline.flags.yaml_errors"
......@@ -75,7 +87,7 @@ export default {
:title="pipeline.yaml_errors"
class="js-pipeline-url-yaml badge badge-danger"
>
yaml invalid
{{ __('yaml invalid') }}
</span>
<span
v-if="pipeline.flags.failure_reason"
......@@ -83,7 +95,7 @@ export default {
:title="pipeline.failure_reason"
class="js-pipeline-url-failure badge badge-danger"
>
error
{{ __('error') }}
</span>
<gl-link
v-if="pipeline.flags.auto_devops"
......@@ -95,7 +107,7 @@ export default {
Auto DevOps
</gl-link>
<span v-if="pipeline.flags.stuck" class="js-pipeline-url-stuck badge badge-warning">
stuck
{{ __('stuck') }}
</span>
<span
v-if="pipeline.flags.merge_request"
......@@ -103,7 +115,7 @@ export default {
:title="__('This pipeline is run in a merge request context')"
class="js-pipeline-url-mergerequest badge badge-info"
>
merge request
{{ __('merge request') }}
</span>
</div>
</div>
......
---
title: Correctly externalize pipeline tags
merge_request: 24028
author:
type: fixed
......@@ -6842,6 +6842,9 @@ msgstr ""
msgid "This pipeline is run in a merge request context"
msgstr ""
msgid "This pipeline makes use of a predefined CI/CD configuration enabled by %{strongStart}Auto DevOps.%{strongEnd}"
msgstr ""
msgid "This pipeline makes use of a predefined CI/CD configuration enabled by <b>Auto DevOps.</b>"
msgstr ""
......@@ -7894,6 +7897,9 @@ msgstr ""
msgid "enabled"
msgstr ""
msgid "error"
msgstr ""
msgid "error code:"
msgstr ""
......@@ -7939,6 +7945,9 @@ msgstr ""
msgid "it is too large"
msgstr ""
msgid "latest"
msgstr ""
msgid "latest deployment"
msgstr ""
......@@ -8205,6 +8214,9 @@ msgstr ""
msgid "started"
msgstr ""
msgid "stuck"
msgstr ""
msgid "this document"
msgstr ""
......@@ -8230,3 +8242,6 @@ msgid "within %d minute "
msgid_plural "within %d minutes "
msgstr[0] ""
msgstr[1] ""
msgid "yaml invalid"
msgstr ""
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment