diff --git a/rhodecode/templates/base/vcs_settings.mako b/rhodecode/templates/base/vcs_settings.mako index 5d0e2d7a..924e17b6 100644 --- a/rhodecode/templates/base/vcs_settings.mako +++ b/rhodecode/templates/base/vcs_settings.mako @@ -307,8 +307,6 @@ ##
## ${_('Use rebase instead of creating a merge commit when merging via web interface.')} ##
- ## Hidden field for commented-out setting to prevent validation errors - ${h.hidden('rhodecode_git_use_rebase_for_merging' + suffix, 'False')}
${h.checkbox('rhodecode_git_close_branch_before_merging' + suffix, 'True', **kwargs)}