diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-02-19 11:49:12 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-02-28 03:26:09 +0300 |
| commit | 6bbc380127d64dcb1dd755dd8082e619fe71bf4e (patch) | |
| tree | a3bcde9fafffcde07c930bceeba356c4bc5c0f65 /app | |
| parent | 716412d96230467054fcd3bbd68059759ca09cec (diff) | |
Add project level config for merge pipelines
Add schema
Add CE counter part
Add default value for
Add changelog
Fix schema
Add test
Fix schema
Fix schema version
Remove default value for
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/_merge_request_merge_settings.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/projects/_merge_request_merge_settings.html.haml b/app/views/projects/_merge_request_merge_settings.html.haml index f178c94e008..6ac2e06afa5 100644 --- a/app/views/projects/_merge_request_merge_settings.html.haml +++ b/app/views/projects/_merge_request_merge_settings.html.haml @@ -9,6 +9,7 @@ %span.descr Pipelines need to be configured to enable this feature. = link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_when_pipeline_succeeds', anchor: 'only-allow-merge-requests-to-be-merged-if-the-pipeline-succeeds'), target: '_blank' + = render_if_exists 'projects/merge_pipelines_settings', form: form .form-check = form.check_box :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-input' = form.label :only_allow_merge_if_all_discussions_are_resolved, class: 'form-check-label' do |