diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:20:54 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:20:54 +0000 |
| commit | 3c99d8308a481b3f6edb002912ffc4d760b7fb64 (patch) | |
| tree | 73555ed44c63103ae57836dd00587e45d084dff2 /app/assets/javascripts/commons | |
| parent | 0336dc438b6faab575df996364076b57e388cc27 (diff) | |
| parent | d3a407d66fa553f3ff8afd1b9e42f01b9912e14a (diff) | |
| download | gitlab-ce-gl-ui-progress-bar.tar.gz | |
Merge branch 'master' into 'gl-ui-progress-bar'gl-ui-progress-bar
# Conflicts:
# app/assets/javascripts/commons/gitlab_ui.js
Diffstat (limited to 'app/assets/javascripts/commons')
| -rw-r--r-- | app/assets/javascripts/commons/gitlab_ui.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/javascripts/commons/gitlab_ui.js b/app/assets/javascripts/commons/gitlab_ui.js index ba43832aa55..82a191d056b 100644 --- a/app/assets/javascripts/commons/gitlab_ui.js +++ b/app/assets/javascripts/commons/gitlab_ui.js @@ -1,8 +1,5 @@ import Vue from 'vue'; -import { - GlLoadingIcon, - GlTooltipDirective, -} from '@gitlab-org/gitlab-ui'; +import { GlLoadingIcon, GlTooltipDirective } from '@gitlab-org/gitlab-ui'; Vue.component('gl-loading-icon', GlLoadingIcon); |