# HG changeset patch # User Martin Bornhold # Date 2016-06-27 09:00:57 # Node ID d861bb79bffaf47300a09a759e5a1019c52637e0 # Parent fff851013ac94c905e87c0f925a09b2c599e95fc settings: Display 'rebase-merge' option in VCS settings. diff --git a/rhodecode/templates/base/vcs_settings.html b/rhodecode/templates/base/vcs_settings.html --- a/rhodecode/templates/base/vcs_settings.html +++ b/rhodecode/templates/base/vcs_settings.html @@ -213,4 +213,23 @@ % endif + + ## This condition has to be adapted if we add more labs settings for + ## VCS types other than 'hg' + % if c.labs_active and (display_globals or repo_type in ['hg']): +
+
+

${_('Labs settings')}

+
+
+
+ ${h.checkbox('rhodecode_hg_use_rebase_for_merging' + suffix, 'True', **kwargs)} + +
+
+ ${_('Use rebase instead of creating a merge commit when merging via web interface')} +
+
+
+ % endif