# HG changeset patch
# User Martin Bornhold <martin@rhodecode.com>
# Date 2016-06-27 14:53:36
# Node ID c728220567c59d9c71d396f805f8576f6fd37b77
# Parent  78788d3457461f1110dac49376543e0ec028b643

settings: Delete obsolete code related to the rebase-merge lab settings.

diff --git a/rhodecode/controllers/admin/settings.py b/rhodecode/controllers/admin/settings.py
--- a/rhodecode/controllers/admin/settings.py
+++ b/rhodecode/controllers/admin/settings.py
@@ -790,13 +790,6 @@ LabSetting = collections.namedtuple(
 # rhodecode.model.forms.LabsSettingsForm.
 _LAB_SETTINGS = [
     LabSetting(
-        key='rhodecode_hg_use_rebase_for_merging',
-        type='bool',
-        group=lazy_ugettext('Mercurial server-side merge'),
-        label=lazy_ugettext('Use rebase instead of creating a merge commit when merging via web interface'),
-        help=''  # Do not translate the empty string!
-    ),
-    LabSetting(
         key='rhodecode_proxy_subversion_http_requests',
         type='bool',
         group=lazy_ugettext('Subversion HTTP Support'),
diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py
--- a/rhodecode/model/forms.py
+++ b/rhodecode/model/forms.py
@@ -416,7 +416,6 @@ def LabsSettingsForm():
         allow_extra_fields = True
         filter_extra_fields = False
 
-        rhodecode_hg_use_rebase_for_merging = v.StringBoolean(if_missing=False)
         rhodecode_proxy_subversion_http_requests = v.StringBoolean(
             if_missing=False)
         rhodecode_subversion_http_server_url = v.UnicodeString(