Show More
@@ -421,9 +421,20 b' class DbManage(object):' | |||||
421 |
|
421 | |||
422 | :param skip_existing: |
|
422 | :param skip_existing: | |
423 | """ |
|
423 | """ | |
|
424 | defaults = [ | |||
|
425 | ('auth_plugins', | |||
|
426 | 'egg:rhodecode-enterprise-ce#token,egg:rhodecode-enterprise-ce#rhodecode', | |||
|
427 | 'list'), | |||
424 |
|
428 | |||
425 | for k, v, t in [('auth_plugins', 'egg:rhodecode-enterprise-ce#rhodecode', 'list'), |
|
429 | ('auth_authtoken_enabled', | |
426 | ('auth_rhodecode_enabled', 'True', 'bool')]: |
|
430 | 'True', | |
|
431 | 'bool'), | |||
|
432 | ||||
|
433 | ('auth_rhodecode_enabled', | |||
|
434 | 'True', | |||
|
435 | 'bool'), | |||
|
436 | ] | |||
|
437 | for k, v, t in defaults: | |||
427 | if (skip_existing and |
|
438 | if (skip_existing and | |
428 | SettingsModel().get_setting_by_name(k) is not None): |
|
439 | SettingsModel().get_setting_by_name(k) is not None): | |
429 | log.debug('Skipping option %s', k) |
|
440 | log.debug('Skipping option %s', k) | |
@@ -568,19 +579,32 b' class DbManage(object):' | |||||
568 | ('title', '', 'unicode'), |
|
579 | ('title', '', 'unicode'), | |
569 | ('pre_code', '', 'unicode'), |
|
580 | ('pre_code', '', 'unicode'), | |
570 | ('post_code', '', 'unicode'), |
|
581 | ('post_code', '', 'unicode'), | |
|
582 | ||||
|
583 | # Visual | |||
571 | ('show_public_icon', True, 'bool'), |
|
584 | ('show_public_icon', True, 'bool'), | |
572 | ('show_private_icon', True, 'bool'), |
|
585 | ('show_private_icon', True, 'bool'), | |
573 | ('stylify_metatags', False, 'bool'), |
|
586 | ('stylify_metatags', False, 'bool'), | |
574 | ('dashboard_items', 100, 'int'), |
|
587 | ('dashboard_items', 100, 'int'), | |
575 | ('admin_grid_items', 25, 'int'), |
|
588 | ('admin_grid_items', 25, 'int'), | |
|
589 | ||||
|
590 | ('markup_renderer', 'markdown', 'unicode'), | |||
|
591 | ||||
576 | ('show_version', True, 'bool'), |
|
592 | ('show_version', True, 'bool'), | |
|
593 | ('show_revision_number', True, 'bool'), | |||
|
594 | ('show_sha_length', 12, 'int'), | |||
|
595 | ||||
577 | ('use_gravatar', False, 'bool'), |
|
596 | ('use_gravatar', False, 'bool'), | |
578 | ('gravatar_url', User.DEFAULT_GRAVATAR_URL, 'unicode'), |
|
597 | ('gravatar_url', User.DEFAULT_GRAVATAR_URL, 'unicode'), | |
|
598 | ||||
579 | ('clone_uri_tmpl', Repository.DEFAULT_CLONE_URI, 'unicode'), |
|
599 | ('clone_uri_tmpl', Repository.DEFAULT_CLONE_URI, 'unicode'), | |
|
600 | ('clone_uri_ssh_tmpl', Repository.DEFAULT_CLONE_URI_SSH, 'unicode'), | |||
580 | ('support_url', '', 'unicode'), |
|
601 | ('support_url', '', 'unicode'), | |
581 | ('update_url', RhodeCodeSetting.DEFAULT_UPDATE_URL, 'unicode'), |
|
602 | ('update_url', RhodeCodeSetting.DEFAULT_UPDATE_URL, 'unicode'), | |
582 | ('show_revision_number', True, 'bool'), |
|
603 | ||
583 | ('show_sha_length', 12, 'int'), |
|
604 | # VCS Settings | |
|
605 | ('pr_merge_enabled', True, 'bool'), | |||
|
606 | ('use_outdated_comments', True, 'bool'), | |||
|
607 | ('diff_cache', True, 'bool'), | |||
584 | ] |
|
608 | ] | |
585 |
|
609 | |||
586 | for key, val, type_ in settings: |
|
610 | for key, val, type_ in settings: |
General Comments 0
You need to be logged in to leave comments.
Login now