diff options
Diffstat (limited to 'app/views/projects/_merge_request_merge_checks_settings.html.haml')
| -rw-r--r-- | app/views/projects/_merge_request_merge_checks_settings.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/projects/_merge_request_merge_checks_settings.html.haml b/app/views/projects/_merge_request_merge_checks_settings.html.haml index 7a5997bbcfd..b099eb6800e 100644 --- a/app/views/projects/_merge_request_merge_checks_settings.html.haml +++ b/app/views/projects/_merge_request_merge_checks_settings.html.haml @@ -24,3 +24,4 @@ = form.check_box :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-input', data: { qa_selector: 'allow_merge_if_all_discussions_are_resolved_checkbox' } = form.label :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-label' do = s_('ProjectSettings|All discussions must be resolved') + = render_if_exists 'projects/merge_request_merge_checks_jira_enforcement', form: form, project: @project |