diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-01-12 14:49:34 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-01-12 14:49:34 -0600 |
| commit | 0815236ffb5c62b6cb8817e5c1f38b2ea26b1681 (patch) | |
| tree | 84128ec7e411509dd6023acbcf2babeb66321ec9 /app/assets/javascripts/sidebar | |
| parent | 562991b6a83347fe14d9f20d2c5cdb5930f4473c (diff) | |
| download | gitlab-ce-0815236ffb5c62b6cb8817e5c1f38b2ea26b1681.tar.gz | |
change loading prop behavior for subscriptions.vue
Diffstat (limited to 'app/assets/javascripts/sidebar')
| -rw-r--r-- | app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue index b409e34923b..3e8cc7a6630 100644 --- a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue +++ b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue @@ -40,7 +40,7 @@ export default { <template> <div class="block subscriptions"> <subscriptions - :loading="store.subscribed === null" + :loading="store.isFetching.subscriptions" :subscribed="store.subscribed" /> </div> diff --git a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue index 3f21500772f..d69d100a26c 100644 --- a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue +++ b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue @@ -37,7 +37,7 @@ }, computed: { showLoadingState() { - return this.subscribed === null || this.loading; + return this.subscribed === null; }, notificationIcon() { return this.subscribed ? ICON_ON : ICON_OFF; |