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

Externalization for pipeline tags

Closes #55721

See merge request gitlab-org/gitlab-ce!24028
This commit is contained in:
Fatih Acet 2019-01-07 15:58:46 +00:00
commit f2c7f3d0aa
3 changed files with 43 additions and 11 deletions

View file

@ -1,8 +1,20 @@
<script> <script>
import { GlLink, GlTooltipDirective } from '@gitlab/ui'; 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 UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
import popover from '~/vue_shared/directives/popover'; 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 { export default {
components: { components: {
UserAvatarLink, UserAvatarLink,
@ -32,14 +44,14 @@ export default {
trigger: 'focus', trigger: 'focus',
placement: 'top', placement: 'top',
title: `<div class="autodevops-title"> title: `<div class="autodevops-title">
This pipeline makes use of a predefined CI/CD configuration enabled by <b>Auto DevOps.</b> ${popoverTitle}
</div>`, </div>`,
content: `<a content: `<a
class="autodevops-link" class="autodevops-link"
href="${this.autoDevopsHelpPath}" href="${this.autoDevopsHelpPath}"
target="_blank" target="_blank"
rel="noopener noreferrer nofollow"> rel="noopener noreferrer nofollow">
Learn more about Auto DevOps ${_.escape(__('Learn more about Auto DevOps'))}
</a>`, </a>`,
}; };
}, },
@ -54,9 +66,9 @@ export default {
<span>by</span> <span>by</span>
<user-avatar-link <user-avatar-link
v-if="user" v-if="user"
:link-href="pipeline.user.path" :link-href="user.path"
:img-src="pipeline.user.avatar_url" :img-src="user.avatar_url"
:tooltip-text="pipeline.user.name" :tooltip-text="user.name"
class="js-pipeline-url-user" class="js-pipeline-url-user"
/> />
<span v-if="!user" class="js-pipeline-url-api api"> API </span> <span v-if="!user" class="js-pipeline-url-api api"> API </span>
@ -64,10 +76,10 @@ export default {
<span <span
v-if="pipeline.flags.latest" v-if="pipeline.flags.latest"
v-gl-tooltip v-gl-tooltip
class="js-pipeline-url-latest badge badge-success"
:title="__('Latest pipeline for this branch')" :title="__('Latest pipeline for this branch')"
class="js-pipeline-url-latest badge badge-success"
> >
latest {{ __('latest') }}
</span> </span>
<span <span
v-if="pipeline.flags.yaml_errors" v-if="pipeline.flags.yaml_errors"
@ -75,7 +87,7 @@ export default {
:title="pipeline.yaml_errors" :title="pipeline.yaml_errors"
class="js-pipeline-url-yaml badge badge-danger" class="js-pipeline-url-yaml badge badge-danger"
> >
yaml invalid {{ __('yaml invalid') }}
</span> </span>
<span <span
v-if="pipeline.flags.failure_reason" v-if="pipeline.flags.failure_reason"
@ -83,7 +95,7 @@ export default {
:title="pipeline.failure_reason" :title="pipeline.failure_reason"
class="js-pipeline-url-failure badge badge-danger" class="js-pipeline-url-failure badge badge-danger"
> >
error {{ __('error') }}
</span> </span>
<gl-link <gl-link
v-if="pipeline.flags.auto_devops" v-if="pipeline.flags.auto_devops"
@ -95,7 +107,7 @@ export default {
Auto DevOps Auto DevOps
</gl-link> </gl-link>
<span v-if="pipeline.flags.stuck" class="js-pipeline-url-stuck badge badge-warning"> <span v-if="pipeline.flags.stuck" class="js-pipeline-url-stuck badge badge-warning">
stuck {{ __('stuck') }}
</span> </span>
<span <span
v-if="pipeline.flags.merge_request" v-if="pipeline.flags.merge_request"
@ -103,7 +115,7 @@ export default {
:title="__('This pipeline is run in a merge request context')" :title="__('This pipeline is run in a merge request context')"
class="js-pipeline-url-mergerequest badge badge-info" class="js-pipeline-url-mergerequest badge badge-info"
> >
merge request {{ __('merge request') }}
</span> </span>
</div> </div>
</div> </div>

View file

@ -0,0 +1,5 @@
---
title: Correctly externalize pipeline tags
merge_request: 24028
author:
type: fixed

View file

@ -6842,6 +6842,9 @@ msgstr ""
msgid "This pipeline is run in a merge request context" msgid "This pipeline is run in a merge request context"
msgstr "" 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>" msgid "This pipeline makes use of a predefined CI/CD configuration enabled by <b>Auto DevOps.</b>"
msgstr "" msgstr ""
@ -7894,6 +7897,9 @@ msgstr ""
msgid "enabled" msgid "enabled"
msgstr "" msgstr ""
msgid "error"
msgstr ""
msgid "error code:" msgid "error code:"
msgstr "" msgstr ""
@ -7939,6 +7945,9 @@ msgstr ""
msgid "it is too large" msgid "it is too large"
msgstr "" msgstr ""
msgid "latest"
msgstr ""
msgid "latest deployment" msgid "latest deployment"
msgstr "" msgstr ""
@ -8205,6 +8214,9 @@ msgstr ""
msgid "started" msgid "started"
msgstr "" msgstr ""
msgid "stuck"
msgstr ""
msgid "this document" msgid "this document"
msgstr "" msgstr ""
@ -8230,3 +8242,6 @@ msgid "within %d minute "
msgid_plural "within %d minutes " msgid_plural "within %d minutes "
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
msgid "yaml invalid"
msgstr ""