##// END OF EJS Templates
fix(ssl): explicitly disable mercurial web_push ssl flag to prevent from errors about ssl required
super-admin -
r5537:7cab32ae default
parent child Browse files
Show More
@@ -75,10 +75,17 b' class AdminSettingsView(BaseAppView):'
75
75
76 if not ret:
76 if not ret:
77 raise Exception('Could not get application ui settings !')
77 raise Exception('Could not get application ui settings !')
78 settings = {}
78 settings = {
79 # legacy param that needs to be kept
80 'web_push_ssl': False
81 }
79 for each in ret:
82 for each in ret:
80 k = each.ui_key
83 k = each.ui_key
81 v = each.ui_value
84 v = each.ui_value
85 # skip some options if they are defined
86 if k in ['push_ssl']:
87 continue
88
82 if k == '/':
89 if k == '/':
83 k = 'root_path'
90 k = 'root_path'
84
91
@@ -92,6 +99,7 b' class AdminSettingsView(BaseAppView):'
92 v = each.ui_active
99 v = each.ui_active
93
100
94 settings[each.ui_section + '_' + k] = v
101 settings[each.ui_section + '_' + k] = v
102
95 return settings
103 return settings
96
104
97 @classmethod
105 @classmethod
@@ -372,14 +372,15 b' def prepare_config_data(clear_session=Tr'
372 """
372 """
373 from rhodecode.model.settings import VcsSettingsModel
373 from rhodecode.model.settings import VcsSettingsModel
374
374
375 config = []
376
377 sa = meta.Session()
375 sa = meta.Session()
378 settings_model = VcsSettingsModel(repo=repo, sa=sa)
376 settings_model = VcsSettingsModel(repo=repo, sa=sa)
379
377
380 ui_settings = settings_model.get_ui_settings()
378 ui_settings = settings_model.get_ui_settings()
381
379
382 ui_data = []
380 ui_data = []
381 config = [
382 ('web', 'push_ssl', 'false'),
383 ]
383 for setting in ui_settings:
384 for setting in ui_settings:
384 # Todo: remove this section once transition to *.ini files will be completed
385 # Todo: remove this section once transition to *.ini files will be completed
385 if setting.section in ('largefiles', 'vcs_git_lfs'):
386 if setting.section in ('largefiles', 'vcs_git_lfs'):
General Comments 0
You need to be logged in to leave comments. Login now