diff options
| author | Andreas Kämmerle <andreas.kaemmerle@gmail.com> | 2018-09-13 12:00:59 +0200 |
|---|---|---|
| committer | Andreas Kämmerle <andreas.kaemmerle@gmail.com> | 2018-09-13 12:00:59 +0200 |
| commit | 87d01cc3bfc12c08024881dc8f13101e5430e3e6 (patch) | |
| tree | 05e82defa51500257f97e3530862da03668895e3 /app/assets/javascripts/deploy_keys/components/action_btn.vue | |
| parent | fef5c923c009c64183cc43909444a1bdaba218b7 (diff) | |
| parent | 71f3d48544cc0857c8d470b182f7e809de6a4642 (diff) | |
| download | gitlab-ce-87d01cc3bfc12c08024881dc8f13101e5430e3e6.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into consolidate-page-widths-part02consolidate-page-widths-part02
Diffstat (limited to 'app/assets/javascripts/deploy_keys/components/action_btn.vue')
| -rw-r--r-- | app/assets/javascripts/deploy_keys/components/action_btn.vue | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/assets/javascripts/deploy_keys/components/action_btn.vue b/app/assets/javascripts/deploy_keys/components/action_btn.vue index 7399fc97d45..10548da8ec5 100644 --- a/app/assets/javascripts/deploy_keys/components/action_btn.vue +++ b/app/assets/javascripts/deploy_keys/components/action_btn.vue @@ -1,11 +1,7 @@ <script> -import loadingIcon from '~/vue_shared/components/loading_icon.vue'; import eventHub from '../eventhub'; export default { - components: { - loadingIcon, - }, props: { deployKey: { type: Object, @@ -45,7 +41,7 @@ export default { class="btn" @click="doAction"> <slot></slot> - <loading-icon + <gl-loading-icon v-if="isLoading" :inline="true" /> |