diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 15:09:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 15:09:18 +0300 |
| commit | b7c735c8ac11b8182807070fc6f84f2606e15427 (patch) | |
| tree | e74b4d25abb8bbf23546f001dd94515e2840a3a3 /app/views/groups | |
| parent | 221b529789f4090341a825695aeb49b8df6dd11d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/groups')
| -rw-r--r-- | app/views/groups/settings/_permissions.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/groups/settings/_permissions.html.haml b/app/views/groups/settings/_permissions.html.haml index 016a9c8e054..1ddaa855e62 100644 --- a/app/views/groups/settings/_permissions.html.haml +++ b/app/views/groups/settings/_permissions.html.haml @@ -37,6 +37,7 @@ = render 'groups/settings/project_creation_level', f: f, group: @group = render 'groups/settings/subgroup_creation_level', f: f, group: @group = render 'groups/settings/two_factor_auth', f: f + = render_if_exists 'groups/personal_access_token_expiration_policy', f: f, group: @group = render_if_exists 'groups/member_lock_setting', f: f, group: @group = f.submit _('Save changes'), class: 'btn btn-success prepend-top-default js-dirty-submit', data: { qa_selector: 'save_permissions_changes_button' } |