diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/assets/javascripts/notes/components/discussion_filter.vue | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/assets/javascripts/notes/components/discussion_filter.vue')
-rw-r--r-- | app/assets/javascripts/notes/components/discussion_filter.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_filter.vue b/app/assets/javascripts/notes/components/discussion_filter.vue index 6b1e3298f9a..989ce9ff144 100644 --- a/app/assets/javascripts/notes/components/discussion_filter.vue +++ b/app/assets/javascripts/notes/components/discussion_filter.vue @@ -1,8 +1,8 @@ <script> import $ from 'jquery'; import { mapGetters, mapActions } from 'vuex'; +import { GlIcon } from '@gitlab/ui'; import { getLocationHash, doesHashExistInUrl } from '../../lib/utils/url_utility'; -import Icon from '~/vue_shared/components/icon.vue'; import { DISCUSSION_FILTERS_DEFAULT_VALUE, HISTORY_ONLY_FILTER_VALUE, @@ -14,7 +14,7 @@ import notesEventHub from '../event_hub'; export default { components: { - Icon, + GlIcon, }, props: { filters: { @@ -120,7 +120,7 @@ export default { data-toggle="dropdown" aria-expanded="false" > - {{ currentFilter.title }} <icon name="chevron-down" /> + {{ currentFilter.title }} <gl-icon name="chevron-down" /> </button> <div ref="dropdownMenu" |