diff options
Diffstat (limited to 'app/views/projects/_merge_request_settings.html.haml')
| -rw-r--r-- | app/views/projects/_merge_request_settings.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/_merge_request_settings.html.haml b/app/views/projects/_merge_request_settings.html.haml index e69972e8163..a54eb2dddac 100644 --- a/app/views/projects/_merge_request_settings.html.haml +++ b/app/views/projects/_merge_request_settings.html.haml @@ -4,8 +4,7 @@ = render 'projects/merge_request_merge_options_settings', project: @project, form: form -- if Feature.enabled?(:squash_options, @project, default_enabled: true) - = render 'projects/merge_request_squash_options_settings', form: form += render 'projects/merge_request_squash_options_settings', form: form = render 'projects/merge_request_merge_checks_settings', project: @project, form: form |