From b3a1dec11e2c0cfca291f8d8ef0a0890f09de913 Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Mon, 27 Jun 2016 11:00:22 +0200 Subject: [PATCH] settings: Add the 'rebase-merge' setting to VCS base form and VCS settings model. --- rhodecode/model/forms.py | 1 + rhodecode/model/settings.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py index d73f9208..fb211226 100644 --- a/rhodecode/model/forms.py +++ b/rhodecode/model/forms.py @@ -382,6 +382,7 @@ class _BaseVcsSettingsForm(formencode.Schema): 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 index 80536f51..9ed7cd5d 100644 --- 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'),