diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/views/profiles/notifications/show.html.haml | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/views/profiles/notifications/show.html.haml')
-rw-r--r-- | app/views/profiles/notifications/show.html.haml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml index e1345a94fb1..cb0ada414ed 100644 --- a/app/views/profiles/notifications/show.html.haml +++ b/app/views/profiles/notifications/show.html.haml @@ -32,7 +32,11 @@ %br .clearfix .form-group.float-left.global-notification-setting - = render 'shared/notifications/button', notification_setting: @global_notification_setting + - if Feature.enabled?(:vue_notification_dropdown, default_enabled: :yaml) + - if @global_notification_setting + .js-vue-notification-dropdown{ data: { dropdown_items: notification_dropdown_items(@global_notification_setting).to_json, notification_level: @global_notification_setting.level, help_page_path: help_page_path('user/profile/notifications'), show_label: 'true' } } + - else + = render 'shared/notifications/button', notification_setting: @global_notification_setting .clearfix |