diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-07 00:07:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-07 00:07:51 +0000 |
| commit | 4e375367b78bb44bd00957522cd9fc3e6d403fef (patch) | |
| tree | 059b1ce541e4128bf03683407d7b5bbbc2094ed5 /app/assets/javascripts/ide/components/merge_requests | |
| parent | 99ddca0d88f1e4e49d61b1aa9d41b5785528d1dc (diff) | |
| download | gitlab-ce-4e375367b78bb44bd00957522cd9fc3e6d403fef.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ide/components/merge_requests')
| -rw-r--r-- | app/assets/javascripts/ide/components/merge_requests/list.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/components/merge_requests/list.vue b/app/assets/javascripts/ide/components/merge_requests/list.vue index 5daf2d1422c..5a8face062b 100644 --- a/app/assets/javascripts/ide/components/merge_requests/list.vue +++ b/app/assets/javascripts/ide/components/merge_requests/list.vue @@ -1,9 +1,9 @@ <script> import { mapActions, mapState } from 'vuex'; import _ from 'underscore'; +import { GlLoadingIcon } from '@gitlab/ui'; import { __ } from '~/locale'; import Icon from '~/vue_shared/components/icon.vue'; -import { GlLoadingIcon } from '@gitlab/ui'; import Item from './item.vue'; import TokenedInput from '../shared/tokened_input.vue'; |