diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-01 06:07:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-01 06:07:50 +0000 |
commit | e50050a8756a20b6aa118edbad3369674e4c63ba (patch) | |
tree | 0f9ae83c168b01707753e066294f7b55aa0968a5 /app/views | |
parent | 1dffba3bd853076efc1107b2dd63e221e75a210c (diff) | |
download | gitlab-ce-e50050a8756a20b6aa118edbad3369674e4c63ba.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/layouts/header/_default.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 202a4018050..5636df7d5e0 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -68,8 +68,7 @@ %li.nav-item.header-user.dropdown{ data: { track_label: "profile_dropdown", track_event: "click_dropdown", track_value: "", qa_selector: 'user_menu' }, class: ('mr-0' if has_impersonation_link) } = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do = image_tag avatar_icon_for_user(current_user, 23), width: 23, height: 23, class: "header-user-avatar qa-user-avatar" - - if show_user_notification_dot? - %span.header-user-notification-dot.rounded-circle.position-relative + = render_if_exists 'layouts/header/user_notification_dot', project: project, namespace: group = sprite_icon('angle-down', css_class: 'caret-down') .dropdown-menu.dropdown-menu-right = render 'layouts/header/current_user_dropdown' |