diff options
author | Rémy Coutable <remy@rymai.me> | 2016-12-05 16:00:26 +0100 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-12-07 12:42:09 +0100 |
commit | 9cc19d9b2ce6af378dce67260c13f208ddc40bca (patch) | |
tree | 9a17d950c134f03ba40b1cad4ada07e74e511f94 /app/views/projects/_merge_request_settings.html.haml | |
parent | 30815a8940c642fa738203da9eda8046eaa0da10 (diff) | |
download | gitlab-ce-9cc19d9b2ce6af378dce67260c13f208ddc40bca.tar.gz |
Remove wrong '.builds-feature' class from the MR settings fieldset25171-fix-mr-features-settings-hidden-when-builds-are-disabled
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 | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/app/views/projects/_merge_request_settings.html.haml b/app/views/projects/_merge_request_settings.html.haml index 6e143c4b570..818010bc7d3 100644 --- a/app/views/projects/_merge_request_settings.html.haml +++ b/app/views/projects/_merge_request_settings.html.haml @@ -1,18 +1,8 @@ -.merge-requests-feature - %fieldset.builds-feature - %hr - %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 - %br - %span.descr - Builds need to be configured to enable this feature. - = link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_when_build_succeeds', anchor: 'only-allow-merge-requests-to-be-merged-if-the-build-succeeds') - .checkbox - = f.label :only_allow_merge_if_all_discussions_are_resolved do - = f.check_box :only_allow_merge_if_all_discussions_are_resolved - %strong Only allow merge requests to be merged if all discussions are resolved +- form = local_assigns.fetch(:form) + +%fieldset.features.merge-requests-feature.append-bottom-default + %hr + %h5.prepend-top-0 + Merge Requests + + = render 'projects/merge_request_merge_settings', form: form |