Merge branch 'enable-squash-option-by-default' into 'master'

Enable squash option feature by default See merge request gitlab-org/gitlab!39382

Merge branch 'enable-squash-option-by-default' into 'master'
Enable squash option feature by default See merge request gitlab-org/gitlab!39382
1eee55f8 · Natalia Tepluhina · 559a7d21 · 31230396 · 1eee55f8 · 1eee55f8
Commit 1eee55f8 authored Aug 13, 2020 by Natalia Tepluhina
2 changed files
--- a/app/views/projects/_merge_request_settings.html.haml
+++ b/app/views/projects/_merge_request_settings.html.haml
@@ -4,7 +4,7 @@

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

- if Feature.enabled?(:squash_options, @project)
+- if Feature.enabled?(:squash_options, @project, default_enabled: true)
  = render 'projects/merge_request_squash_options_settings', form: form

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

--- a/ee/app/views/projects/_merge_request_settings.html.haml
+++ b/ee/app/views/projects/_merge_request_settings.html.haml
@@ -4,7 +4,7 @@

 = render_ce 'projects/merge_request_merge_options_settings', project: @project, form: form

- if Feature.enabled?(:squash_options, @project)
+- if Feature.enabled?(:squash_options, @project, default_enabled: true)
  = render_ce 'projects/merge_request_squash_options_settings', form: form

 = render_ce 'projects/merge_request_merge_checks_settings', project: @project, form: form