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/groups/_form.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/groups/_form.html.haml')
| -rw-r--r-- | app/views/admin/groups/_form.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index 0c3ce1f3fa4..8ac6f63cdfb 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -18,7 +18,7 @@ .form-group.row .offset-sm-2.col-sm-10 - = render 'shared/allow_request_access', form: f, bold_label: true + = render 'shared/allow_request_access', form: f = render 'groups/group_admin_settings', f: f @@ -27,7 +27,7 @@ - if @group.new_record? .form-group.row .offset-sm-2.col-sm-10 - = render 'shared/global_alert', dismissible: false do + = render Pajamas::AlertComponent.new(dismissible: false) do .gl-alert-body = render 'shared/group_tips' .form-actions |