Skip to content

G
gitlab-ce
Commit 31230396 authored by Samantha Ming's avatar Samantha Ming
Browse files
Options

Enable squash option feature by default

parent 55aaf11a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
app/views/projects/_merge_request_settings.html.haml
View file @ 31230396
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
= render 'projects/merge_request_merge_options_settings', project: @project, form: form = 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_squash_options_settings', form: form
= render 'projects/merge_request_merge_checks_settings', project: @project, form: form = render 'projects/merge_request_merge_checks_settings', project: @project, form: form
......
ee/app/views/projects/_merge_request_settings.html.haml
View file @ 31230396
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
= render_ce 'projects/merge_request_merge_options_settings', project: @project, form: form = 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_squash_options_settings', form: form
= render_ce 'projects/merge_request_merge_checks_settings', project: @project, form: form = render_ce 'projects/merge_request_merge_checks_settings', project: @project, form: form
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7