diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-07-22 18:14:53 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-07-22 18:14:53 +0300 |
| commit | ffb39001616f0c9457785e44bcabfc7342e9f919 (patch) | |
| tree | 8a4972a3e7f6f068bc0622c476f1ed56a4715a3e /app | |
| parent | 8b284a51c03d6ab0634f115b38014d5a87f73d57 (diff) | |
| parent | 36f8d7bd7950dbc2ddc6bc6299b5947d80ec5cd9 (diff) | |
Merge branch 'ce-9688-add-remove-blocking-mrs' into 'master'
CE backport of "Add or remove blocking merge requests"
See merge request gitlab-org/gitlab-ce!30908
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index 214e87052da..07a7b5ce9de 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -33,6 +33,8 @@ = render_if_exists 'shared/issuable/approvals', issuable: issuable, presenter: presenter, form: form += render_if_exists "shared/issuable/form/merge_request_blocks", issuable: issuable, form: form + = render 'shared/issuable/form/branch_chooser', issuable: issuable, form: form = render 'shared/issuable/form/merge_params', issuable: issuable |