# HG changeset patch
# User Martin Bornhold <martin@rhodecode.com>
# Date 2016-06-27 09:00:22
# Node ID fff851013ac94c905e87c0f925a09b2c599e95fc
# Parent  bd7af94fcdbeed9bb9d8ab329b37bc7d7f27944a

settings: Add the 'rebase-merge' setting to VCS base form and VCS settings model.

diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py
--- a/rhodecode/model/forms.py
+++ b/rhodecode/model/forms.py
@@ -382,6 +382,7 @@ class _BaseVcsSettingsForm(formencode.Sc
 
     rhodecode_pr_merge_enabled = v.StringBoolean(if_missing=False)
     rhodecode_use_outdated_comments = v.StringBoolean(if_missing=False)
+    rhodecode_hg_use_rebase_for_merging = v.StringBoolean(if_missing=False)
 
 
 def ApplicationUiSettingsForm():
diff --git a/rhodecode/model/settings.py b/rhodecode/model/settings.py
--- a/rhodecode/model/settings.py
+++ b/rhodecode/model/settings.py
@@ -401,7 +401,9 @@ class IssueTrackerSettingsModel(object):
 class VcsSettingsModel(object):
 
     INHERIT_SETTINGS = 'inherit_vcs_settings'
-    GENERAL_SETTINGS = ('use_outdated_comments', 'pr_merge_enabled')
+    GENERAL_SETTINGS = (
+        'use_outdated_comments', 'pr_merge_enabled',
+        'hg_use_rebase_for_merging')
     HOOKS_SETTINGS = (
         ('hooks', 'changegroup.repo_size'),
         ('hooks', 'changegroup.push_logger'),