# HG changeset patch # User Martin Bornhold # Date 2016-06-28 15:30:31 # Node ID 33288bb9deea87be0708ac7b0bdd5c775cf4f6dd # Parent c728220567c59d9c71d396f805f8576f6fd37b77 settings: Use the old layout to display labs 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 @@ -219,16 +219,25 @@ % if c.labs_active and (display_globals or repo_type in ['hg']):
-

${_('Labs settings')}

+

${_('Labs settings')}: ${_('These features are considered experimental and may not work as expected.')}

-
- ${h.checkbox('rhodecode_hg_use_rebase_for_merging' + suffix, 'True', **kwargs)} - +
+ +
+
+ +
+
+
+ ${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