diff options
| author | Rui Anderson <anderson.rui@gmail.com> | 2016-04-27 15:34:42 -0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-10 14:36:54 +0200 |
| commit | 07dbd6b3884c4f188b2c3f29dd7419791f1051eb (patch) | |
| tree | 6c00e4b9097f62a89fcd6f506a9c7b3eb27231bc /app/views/projects/_merge_request_settings.html.haml | |
| parent | cfc99bbd1390bc548a703fdc7857c7db5b0e7c13 (diff) | |
| download | gitlab-ce-07dbd6b3884c4f188b2c3f29dd7419791f1051eb.tar.gz | |
Allow or not merge MR with failed build
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/views/projects/_merge_request_settings.html.haml')
| -rw-r--r-- | app/views/projects/_merge_request_settings.html.haml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/app/views/projects/_merge_request_settings.html.haml b/app/views/projects/_merge_request_settings.html.haml new file mode 100644 index 00000000000..da522b53417 --- /dev/null +++ b/app/views/projects/_merge_request_settings.html.haml @@ -0,0 +1,11 @@ +%fieldset.builds-feature + %h5.prepend-top-0 + Merge Requests + .form-group + .checkbox + = f.label :only_allow_merge_if_build_succeeds do + = f.check_box :only_allow_merge_if_build_succeeds + %strong Only allow merge requests to be merged if the build succeeds + .help-block + Builds need to be configured to enable this feature. + = link_to icon('question-circle'), help_page_path('workflow', 'merge_requests#only-allow-merge-requests-to-be-merged-if-the-build-succeeds') |