Show More
@@ -790,13 +790,6 b' LabSetting = collections.namedtuple(' | |||
|
790 | 790 | # rhodecode.model.forms.LabsSettingsForm. |
|
791 | 791 | _LAB_SETTINGS = [ |
|
792 | 792 | LabSetting( |
|
793 | key='rhodecode_hg_use_rebase_for_merging', | |
|
794 | type='bool', | |
|
795 | group=lazy_ugettext('Mercurial server-side merge'), | |
|
796 | label=lazy_ugettext('Use rebase instead of creating a merge commit when merging via web interface'), | |
|
797 | help='' # Do not translate the empty string! | |
|
798 | ), | |
|
799 | LabSetting( | |
|
800 | 793 | key='rhodecode_proxy_subversion_http_requests', |
|
801 | 794 | type='bool', |
|
802 | 795 | group=lazy_ugettext('Subversion HTTP Support'), |
@@ -416,7 +416,6 b' def LabsSettingsForm():' | |||
|
416 | 416 | allow_extra_fields = True |
|
417 | 417 | filter_extra_fields = False |
|
418 | 418 | |
|
419 | rhodecode_hg_use_rebase_for_merging = v.StringBoolean(if_missing=False) | |
|
420 | 419 | rhodecode_proxy_subversion_http_requests = v.StringBoolean( |
|
421 | 420 | if_missing=False) |
|
422 | 421 | rhodecode_subversion_http_server_url = v.UnicodeString( |
General Comments 0
You need to be logged in to leave comments.
Login now