diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
| commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
| tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/views/admin/users/_users.html.haml | |
| parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/views/admin/users/_users.html.haml')
| -rw-r--r-- | app/views/admin/users/_users.html.haml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/views/admin/users/_users.html.haml b/app/views/admin/users/_users.html.haml index ad7ce57ebda..86391b980c0 100644 --- a/app/views/admin/users/_users.html.haml +++ b/app/views/admin/users/_users.html.haml @@ -1,8 +1,7 @@ - if registration_features_can_be_prompted? - = render 'shared/global_alert', - variant: :tip, + = render Pajamas::AlertComponent.new(variant: :tip, alert_class: 'gl-my-5', - dismissible: false do + dismissible: false) do .gl-alert-body = render 'shared/registration_features_discovery_message', feature_title: s_('RegistrationFeatures|send emails to users') @@ -68,5 +67,3 @@ = gl_loading_icon(size: 'lg', css_class: 'gl-my-7') = paginate_collection @users - -= render partial: 'admin/users/modals' |