diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2018-11-16 15:34:36 -0600 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2018-11-16 15:34:36 -0600 |
| commit | 352ec5eb3bf8b871d5f1350a18404074cee9e810 (patch) | |
| tree | a2af6f81db1a2c9cc71694d8a00c2c8edf20c8c2 /app | |
| parent | 50e6cc11f8f4f535d8c012661695db595a7cc513 (diff) | |
| download | gitlab-ce-352ec5eb3bf8b871d5f1350a18404074cee9e810.tar.gz | |
CE port of "Move merge request approval settings"ce-1979-move-mr-approval-settings
This is for the upcoming feature for MR approval rules (https://gitlab.com/gitlab-org/gitlab-ee/issues/1979)
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/edit.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index de768696fe9..f376df29878 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -95,6 +95,8 @@ = render 'projects/merge_request_settings', form: f = f.submit 'Save changes', class: "btn btn-success qa-save-merge-request-changes" + = render_if_exists 'projects/merge_request_approvals_settings', expanded: expanded + = render_if_exists 'projects/service_desk_settings' %section.settings.no-animate{ class: ('expanded' if expanded) } |