diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/views/layouts/header/_current_user_dropdown.html.haml | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
download | gitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/views/layouts/header/_current_user_dropdown.html.haml')
-rw-r--r-- | app/views/layouts/header/_current_user_dropdown.html.haml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/views/layouts/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml index 4c659241f99..dcc6cba8444 100644 --- a/app/views/layouts/header/_current_user_dropdown.html.haml +++ b/app/views/layouts/header/_current_user_dropdown.html.haml @@ -14,7 +14,11 @@ %li.divider - if can?(current_user, :update_user_status, current_user) %li - .js-set-status-modal-trigger{ data: { has_status: current_user.status.present? ? 'true' : 'false' } } + %button.btn.menu-item.js-set-status-modal-trigger{ type: 'button' } + - if current_user.status.present? + = s_('SetStatusModal|Edit status') + - else + = s_('SetStatusModal|Set status') - if current_user_menu?(:profile) %li = link_to s_("CurrentUser|Profile"), current_user, class: 'profile-link', data: { user: current_user.username } @@ -35,6 +39,8 @@ = link_to _("Help"), help_path %li.d-md-none = link_to _("Support"), support_url + %li.d-md-none + = render 'shared/help_dropdown_forum_link' %li.d-md-none = link_to _("Submit feedback"), "https://about.gitlab.com/submit-feedback" - if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile) |