diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-08 00:08:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-08 00:08:27 +0300 |
| commit | 4df2fd43039fb3f09086525501db071790e1699f (patch) | |
| tree | 9af966dc861351d7a7d97dd9f6a586d5700a63d3 /app/assets/javascripts/pipelines | |
| parent | c2bdb9d02768a61bee7560113f4d4c83dc91338e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipelines')
2 files changed, 4 insertions, 8 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_ci_templates.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_ci_templates.vue index d50229e47c4..9dc6ae317ea 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_ci_templates.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_ci_templates.vue @@ -2,6 +2,7 @@ import { GlAvatar, GlButton, GlCard, GlSprintf, GlIcon, GlLink } from '@gitlab/ui'; import { mergeUrlParams } from '~/lib/utils/url_utility'; import { sprintf } from '~/locale'; +import { AVATAR_SHAPE_OPTION_RECT } from '~/vue_shared/constants'; import { STARTER_TEMPLATE_NAME, RUNNERS_AVAILABILITY_SECTION_EXPERIMENT_NAME, @@ -33,6 +34,7 @@ export default { RUNNERS_DOCUMENTATION_LINK_CLICKED_EVENT, RUNNERS_SETTINGS_BUTTON_CLICKED_EVENT, I18N, + AVATAR_SHAPE_OPTION_RECT, inject: ['pipelineEditorPath', 'suggestedCiTemplates'], props: { ciRunnerSettingsPath: { @@ -187,7 +189,7 @@ export default { :src="template.logo" :size="48" class="gl-mr-5 gl-bg-white dark-mode-override" - shape="rect" + :shape="$options.AVATAR_SHAPE_OPTION_RECT" :alt="template.name" data-testid="template-logo" /> diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_trigger_author_token.vue b/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_trigger_author_token.vue index 33115d72b9c..746cf238646 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_trigger_author_token.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/tokens/pipeline_trigger_author_token.vue @@ -83,13 +83,7 @@ export default { @input="searchAuthors" > <template #view="{ inputValue }"> - <gl-avatar - v-if="activeUser" - :size="16" - :src="activeUser.avatar_url" - shape="circle" - class="gl-mr-2" - /> + <gl-avatar v-if="activeUser" :size="16" :src="activeUser.avatar_url" class="gl-mr-2" /> <span>{{ activeUser ? activeUser.name : inputValue }}</span> </template> <template #suggestions> |