gitlab-org--gitlab-foss/app/views/projects/_merge_request_settings.html.haml

- form = local_assigns.fetch(:form)

= render 'projects/merge_request_merge_method_settings', project: @project, form: form

= render 'projects/merge_request_merge_settings', form: form
Remove wrong '.builds-feature' class from the MR settings fieldset Signed-off-by: Rémy Coutable <remy@rymai.me> 2016-12-05 10:00:26 -05:00			`- form = local_assigns.fetch(:form)`

Cleanup code for General Project Settings 2018-05-31 04:44:32 -04:00			`= render 'projects/merge_request_merge_method_settings', project: @project, form: form`
Port fast-forward merge request setting from EE 2017-09-15 17:23:03 -04:00
try and fix some tests 2017-07-12 17:32:04 -04:00			`= render 'projects/merge_request_merge_settings', form: form`