diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-05-28 18:24:21 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-07-22 14:28:31 +0100 |
| commit | 23e0e7ac0b6cd5e1ed0e5e70b6473fd7c4e7844f (patch) | |
| tree | c2ee5261b6ba0b8b1e3b10f935270f757f65508e /app/views/shared/issuable | |
| parent | a600f147b4e9045534d4cf66e207d230b2af954e (diff) | |
| download | gitlab-ce-23e0e7ac0b6cd5e1ed0e5e70b6473fd7c4e7844f.tar.gz | |
Backport CE parts of "Allow blocking merge requests to be configured"
Diffstat (limited to 'app/views/shared/issuable')
| -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 |