settings: Delete obsolete code related to the rebase-merge lab settings.
This commit is contained in:
parent
0f767f23a4
commit
77c3287d4a
2 changed files with 0 additions and 8 deletions
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -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(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue