diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
commit | edaa33dee2ff2f7ea3fac488d41558eb5f86d68c (patch) | |
tree | 11f143effbfeba52329fb7afbd05e6e2a3790241 /app/views/admin/users/_users.html.haml | |
parent | d8a5691316400a0f7ec4f83832698f1988eb27c1 (diff) |
Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42
Diffstat (limited to 'app/views/admin/users/_users.html.haml')
-rw-r--r-- | app/views/admin/users/_users.html.haml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/views/admin/users/_users.html.haml b/app/views/admin/users/_users.html.haml index e62e4cfa192..5edd5403d49 100644 --- a/app/views/admin/users/_users.html.haml +++ b/app/views/admin/users/_users.html.haml @@ -1,3 +1,11 @@ +- if registration_features_can_be_prompted? + = render 'shared/global_alert', + variant: :tip, + alert_class: 'gl-my-5', + dismissible: false do + .gl-alert-body + = render 'shared/registration_features_discovery_message', feature_title: s_('RegistrationFeatures|send emails to users') + .top-area.scrolling-tabs-container.inner-page-scroll-tabs .fade-left = sprite_icon('chevron-lg-left', size: 12) @@ -51,7 +59,7 @@ = hidden_field_tag :sort, @sort = sprite_icon('search', css_class: 'search-icon') = button_tag s_('AdminUsers|Search users') if Rails.env.test? - .dropdown.user-sort-dropdown + .dropdown.gl-ml-3 = label_tag 'Sort by', nil, class: 'label-bold' - toggle_text = @sort.present? ? users_sort_options_hash[@sort] : sort_title_name = dropdown_toggle(toggle_text, { toggle: 'dropdown' }) |