diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
| commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
| tree | c42be41678c2586d49a75cabce89322082698334 /app/assets/javascripts/notifications | |
| parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/notifications')
| -rw-r--r-- | app/assets/javascripts/notifications/components/custom_notifications_modal.vue | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/notifications/components/notifications_dropdown.vue | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/notifications/components/custom_notifications_modal.vue b/app/assets/javascripts/notifications/components/custom_notifications_modal.vue index 2b5cff35fc8..182948c39f4 100644 --- a/app/assets/javascripts/notifications/components/custom_notifications_modal.vue +++ b/app/assets/javascripts/notifications/components/custom_notifications_modal.vue @@ -73,7 +73,7 @@ export default { this.events = this.buildEvents(events); } catch (error) { - this.$toast.show(this.$options.i18n.loadNotificationLevelErrorMessage, { type: 'error' }); + this.$toast.show(this.$options.i18n.loadNotificationLevelErrorMessage); } finally { this.isLoading = false; } @@ -93,7 +93,7 @@ export default { this.events = this.buildEvents(events); } catch (error) { - this.$toast.show(this.$options.i18n.updateNotificationLevelErrorMessage, { type: 'error' }); + this.$toast.show(this.$options.i18n.updateNotificationLevelErrorMessage); } }, }, @@ -132,7 +132,7 @@ export default { @change="updateEvent($event, event)" > <strong>{{ event.name }}</strong - ><gl-loading-icon v-if="event.loading" :inline="true" class="gl-ml-2" /> + ><gl-loading-icon v-if="event.loading" size="sm" :inline="true" class="gl-ml-2" /> </gl-form-checkbox> </gl-form-group> </template> diff --git a/app/assets/javascripts/notifications/components/notifications_dropdown.vue b/app/assets/javascripts/notifications/components/notifications_dropdown.vue index 4963b9386c1..69eb2115bf4 100644 --- a/app/assets/javascripts/notifications/components/notifications_dropdown.vue +++ b/app/assets/javascripts/notifications/components/notifications_dropdown.vue @@ -104,7 +104,7 @@ export default { this.selectedNotificationLevel = level; this.openNotificationsModal(); } catch (error) { - this.$toast.show(this.$options.i18n.updateNotificationLevelErrorMessage, { type: 'error' }); + this.$toast.show(this.$options.i18n.updateNotificationLevelErrorMessage); } finally { this.isLoading = false; } |