From 23e0e7ac0b6cd5e1ed0e5e70b6473fd7c4e7844f Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Tue, 28 May 2019 18:24:21 +0100 Subject: Backport CE parts of "Allow blocking merge requests to be configured" --- app/views/shared/issuable/_form.html.haml | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v1.2.1