##// END OF EJS Templates
settings: Add the 'rebase-merge' setting to VCS base form and VCS settings model.
Martin Bornhold -
r358:fff85101 default
parent child Browse files
Show More
@@ -382,6 +382,7 b' class _BaseVcsSettingsForm(formencode.Sc'
382
382
383 rhodecode_pr_merge_enabled = v.StringBoolean(if_missing=False)
383 rhodecode_pr_merge_enabled = v.StringBoolean(if_missing=False)
384 rhodecode_use_outdated_comments = v.StringBoolean(if_missing=False)
384 rhodecode_use_outdated_comments = v.StringBoolean(if_missing=False)
385 rhodecode_hg_use_rebase_for_merging = v.StringBoolean(if_missing=False)
385
386
386
387
387 def ApplicationUiSettingsForm():
388 def ApplicationUiSettingsForm():
@@ -401,7 +401,9 b' class IssueTrackerSettingsModel(object):'
401 class VcsSettingsModel(object):
401 class VcsSettingsModel(object):
402
402
403 INHERIT_SETTINGS = 'inherit_vcs_settings'
403 INHERIT_SETTINGS = 'inherit_vcs_settings'
404 GENERAL_SETTINGS = ('use_outdated_comments', 'pr_merge_enabled')
404 GENERAL_SETTINGS = (
405 'use_outdated_comments', 'pr_merge_enabled',
406 'hg_use_rebase_for_merging')
405 HOOKS_SETTINGS = (
407 HOOKS_SETTINGS = (
406 ('hooks', 'changegroup.repo_size'),
408 ('hooks', 'changegroup.repo_size'),
407 ('hooks', 'changegroup.push_logger'),
409 ('hooks', 'changegroup.push_logger'),
General Comments 0
You need to be logged in to leave comments. Login now