Merge branch 'add_jira_enforcmenet_check' into 'master'

Add missing Jira enforcement check in Project Setting See merge request gitlab-org/gitlab!56576

Merge branch 'add_jira_enforcmenet_check' into 'master'
Add missing Jira enforcement check in Project Setting See merge request gitlab-org/gitlab!56576
0b66a30b · Mark Florian · 8b880a22 · 3059ea5e · 0b66a30b
Commit 0b66a30b authored Mar 15, 2021 by Mark Florian
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

app/views/projects/_merge_request_merge_checks_settings.html.haml ...s/projects/_merge_request_merge_checks_settings.html.haml +1 -0

No files found.
--- a/app/views/projects/_merge_request_merge_checks_settings.html.haml
+++ b/app/views/projects/_merge_request_merge_checks_settings.html.haml
@@ -22,3 +22,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