From 77c3287d4ad23989fc7d720a132cd8e32e02fb12 Mon Sep 17 00:00:00 2001
From: Martin Bornhold <martin@rhodecode.com>
Date: Mon, 27 Jun 2016 16:53:36 +0200
Subject: [PATCH] settings: Delete obsolete code related to the rebase-merge
 lab settings.

---
 rhodecode/controllers/admin/settings.py | 7 -------
 rhodecode/model/forms.py                | 1 -
 2 files changed, 8 deletions(-)

diff --git a/rhodecode/controllers/admin/settings.py b/rhodecode/controllers/admin/settings.py
index cd87d6b4..e65b9e7e 100644
--- a/rhodecode/controllers/admin/settings.py
+++ b/rhodecode/controllers/admin/settings.py
@@ -789,13 +789,6 @@ LabSetting = collections.namedtuple(
 # This list has to be kept in sync with the form
 # 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',
diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py
index fb211226..edb9e1c7 100644
--- 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(