diff options
author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-11-02 09:02:52 +0100 |
---|---|---|
committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-11-02 09:02:52 +0100 |
commit | f4023a69cb5e78fca595a2151a2272fbdfd5917a (patch) | |
tree | 12bfc6bc746b80a1099431dccb8df0fcb30ad0fc /app/assets/javascripts/pipelines/components/pipelines_actions.vue | |
parent | 79911cb4ddc8724cc2270570261e807a8cf7eb60 (diff) | |
parent | a0ca86e5a3777bc4800fc96765d8536091671ef3 (diff) | |
download | gitlab-ce-f4023a69cb5e78fca595a2151a2272fbdfd5917a.tar.gz |
Merge remote-tracking branch 'origin/master' into dev-master
Diffstat (limited to 'app/assets/javascripts/pipelines/components/pipelines_actions.vue')
-rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines_actions.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipelines_actions.vue b/app/assets/javascripts/pipelines/components/pipelines_actions.vue index d032ad73f71..a7507fb3b6f 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_actions.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_actions.vue @@ -1,7 +1,7 @@ <script> import { s__, sprintf } from '~/locale'; import eventHub from '../event_hub'; -import icon from '../../vue_shared/components/icon.vue'; +import Icon from '../../vue_shared/components/icon.vue'; import tooltip from '../../vue_shared/directives/tooltip'; import GlCountdown from '~/vue_shared/components/gl_countdown.vue'; @@ -10,7 +10,7 @@ export default { tooltip, }, components: { - icon, + Icon, GlCountdown, }, props: { |