diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
| commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
| tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /app/views/admin/application_settings/_account_and_limit.html.haml | |
| parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) | |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'app/views/admin/application_settings/_account_and_limit.html.haml')
| -rw-r--r-- | app/views/admin/application_settings/_account_and_limit.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/admin/application_settings/_account_and_limit.html.haml b/app/views/admin/application_settings/_account_and_limit.html.haml index c091a2180c5..0f7b10f822d 100644 --- a/app/views/admin/application_settings/_account_and_limit.html.haml +++ b/app/views/admin/application_settings/_account_and_limit.html.haml @@ -69,4 +69,6 @@ = render 'admin/application_settings/invitation_flow_enforcement', form: f = render 'admin/application_settings/user_restrictions', form: f = render_if_exists 'admin/application_settings/availability_on_namespace_setting', form: f + -# This is added for Jihu edition which should not be deleted without notifying Jihu + = render_if_exists 'admin/application_settings/password_expiration_setting', form: f = f.submit _('Save changes'), pajamas_button: true, data: { qa_selector: 'save_changes_button' } |