diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-09-11 22:19:21 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-09-11 22:19:21 +0000 |
commit | f815b48f3981ad6f225827c3e9cc08850a4f7438 (patch) | |
tree | ed064db5a87deff150ea8f280f368d87cb31cf2e /app/assets/javascripts/ide/components/merge_requests | |
parent | 85aeaf055af3355d04d1d298db41b63570f71fd3 (diff) | |
download | gitlab-ce-f815b48f3981ad6f225827c3e9cc08850a4f7438.tar.gz |
Use gitlab-ui loading icon
Diffstat (limited to 'app/assets/javascripts/ide/components/merge_requests')
-rw-r--r-- | app/assets/javascripts/ide/components/merge_requests/list.vue | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/javascripts/ide/components/merge_requests/list.vue b/app/assets/javascripts/ide/components/merge_requests/list.vue index fc612956688..c8343e77860 100644 --- a/app/assets/javascripts/ide/components/merge_requests/list.vue +++ b/app/assets/javascripts/ide/components/merge_requests/list.vue @@ -3,7 +3,6 @@ import { mapActions, mapState } from 'vuex'; import _ from 'underscore'; import { __ } from '~/locale'; import Icon from '~/vue_shared/components/icon.vue'; -import LoadingIcon from '~/vue_shared/components/loading_icon.vue'; import Item from './item.vue'; import TokenedInput from '../shared/tokened_input.vue'; @@ -14,7 +13,6 @@ const SEARCH_TYPES = [ export default { components: { - LoadingIcon, TokenedInput, Item, Icon, @@ -98,10 +96,10 @@ export default { </div> </div> <div class="dropdown-content ide-merge-requests-dropdown-content d-flex"> - <loading-icon + <gl-loading-icon v-if="isLoading" + :size="2" class="mt-3 mb-3 align-self-center ml-auto mr-auto" - size="2" /> <template v-else> <ul |