Commit 132a369d authored by Denys Mishunov's avatar Denys Mishunov

Merge branch '335516-replace-deprecated-project_avatar' into 'master'

Use ProjectAvatar in `create_issue_form.vue`

See merge request gitlab-org/gitlab!65842
parents cfb23600 2423c5c2
...@@ -19,7 +19,7 @@ import { STORAGE_KEY } from '~/frequent_items/constants'; ...@@ -19,7 +19,7 @@ import { STORAGE_KEY } from '~/frequent_items/constants';
import { getTopFrequentItems } from '~/frequent_items/utils'; import { getTopFrequentItems } from '~/frequent_items/utils';
import AccessorUtilities from '~/lib/utils/accessor'; import AccessorUtilities from '~/lib/utils/accessor';
import { __ } from '~/locale'; import { __ } from '~/locale';
import ProjectAvatar from '~/vue_shared/components/deprecated_project_avatar/default.vue'; import ProjectAvatar from '~/vue_shared/components/project_avatar.vue';
import { SEARCH_DEBOUNCE } from '../constants'; import { SEARCH_DEBOUNCE } from '../constants';
export default { export default {
...@@ -199,7 +199,10 @@ export default { ...@@ -199,7 +199,10 @@ export default {
class="gl-w-full select-project-dropdown" class="gl-w-full select-project-dropdown"
@click="() => handleRecentItemSelection(project)" @click="() => handleRecentItemSelection(project)"
> >
<span><project-avatar :project="project" :size="32" /></span> <project-avatar
:project-avatar-url="project.avatar_url"
:project-name="project.name"
/>
<span <span
><span class="block">{{ project.name }}</span> ><span class="block">{{ project.name }}</span>
<span class="block text-secondary">{{ project.namespace }}</span></span <span class="block text-secondary">{{ project.namespace }}</span></span
...@@ -218,7 +221,10 @@ export default { ...@@ -218,7 +221,10 @@ export default {
class="gl-w-full select-project-dropdown" class="gl-w-full select-project-dropdown"
@click="selectedProject = project" @click="selectedProject = project"
> >
<span><project-avatar :project="project" :size="32" /></span> <project-avatar
:project-avatar-url="project.avatar_url"
:project-name="project.name"
/>
<span <span
><span class="block">{{ project.name }}</span> ><span class="block">{{ project.name }}</span>
<span class="block text-secondary">{{ project.namespace.name }}</span></span <span class="block text-secondary">{{ project.namespace.name }}</span></span
......
...@@ -13,7 +13,7 @@ import Vuex from 'vuex'; ...@@ -13,7 +13,7 @@ import Vuex from 'vuex';
import CreateIssueForm from 'ee/related_items_tree/components/create_issue_form.vue'; import CreateIssueForm from 'ee/related_items_tree/components/create_issue_form.vue';
import createDefaultStore from 'ee/related_items_tree/store'; import createDefaultStore from 'ee/related_items_tree/store';
import ProjectAvatar from '~/vue_shared/components/deprecated_project_avatar/default.vue'; import ProjectAvatar from '~/vue_shared/components/project_avatar.vue';
import { import {
mockInitialConfig, mockInitialConfig,
......
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