Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Hanselka <alex@gitlab.com>2018-12-11 00:42:50 +0300
committerAlex Hanselka <alex@gitlab.com>2018-12-11 00:42:50 +0300
commitf77888fe0857c9f4a47133f434c741a510946767 (patch)
treeb227b60894474ba2c9a8864b66e4df65763b35b8 /app/assets/javascripts/notifications_dropdown.js
parentd2120ff1e705799752e7d9704cae3f1896d8e186 (diff)
parent2d7dc668506a0576e231fbe290c89e47cf088300 (diff)
Merge branch '11-6-stable-prepare-rc5' into '11-6-stable'
Prepare 11.6 RC5 release See merge request gitlab-org/gitlab-ce!23704
Diffstat (limited to 'app/assets/javascripts/notifications_dropdown.js')
-rw-r--r--app/assets/javascripts/notifications_dropdown.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/notifications_dropdown.js b/app/assets/javascripts/notifications_dropdown.js
index c4c8cf86cb0..e7fa05faa8a 100644
--- a/app/assets/javascripts/notifications_dropdown.js
+++ b/app/assets/javascripts/notifications_dropdown.js
@@ -12,6 +12,10 @@ export default function notificationsDropdown() {
const form = $(this).parents('.notification-form:first');
form.find('.js-notification-loading').toggleClass('fa-bell fa-spin fa-spinner');
+ if (form.hasClass('no-label')) {
+ form.find('.js-notification-loading').toggleClass('hidden');
+ form.find('.js-notifications-icon').toggleClass('hidden');
+ }
form.find('#notification_setting_level').val(notificationLevel);
form.submit();
});