fix(ssl): explicitly disable mercurial web_push ssl flag to prevent from errors about ssl required
This commit is contained in:
parent
0eeee78a52
commit
5fc38bda7c
2 changed files with 12 additions and 3 deletions
|
|
@ -75,10 +75,17 @@ class AdminSettingsView(BaseAppView):
|
|||
|
||||
if not ret:
|
||||
raise Exception('Could not get application ui settings !')
|
||||
settings = {}
|
||||
settings = {
|
||||
# legacy param that needs to be kept
|
||||
'web_push_ssl': False
|
||||
}
|
||||
for each in ret:
|
||||
k = each.ui_key
|
||||
v = each.ui_value
|
||||
# skip some options if they are defined
|
||||
if k in ['push_ssl']:
|
||||
continue
|
||||
|
||||
if k == '/':
|
||||
k = 'root_path'
|
||||
|
||||
|
|
@ -92,6 +99,7 @@ class AdminSettingsView(BaseAppView):
|
|||
v = each.ui_active
|
||||
|
||||
settings[each.ui_section + '_' + k] = v
|
||||
|
||||
return settings
|
||||
|
||||
@classmethod
|
||||
|
|
|
|||
|
|
@ -372,14 +372,15 @@ def prepare_config_data(clear_session=True, repo=None):
|
|||
"""
|
||||
from rhodecode.model.settings import VcsSettingsModel
|
||||
|
||||
config = []
|
||||
|
||||
sa = meta.Session()
|
||||
settings_model = VcsSettingsModel(repo=repo, sa=sa)
|
||||
|
||||
ui_settings = settings_model.get_ui_settings()
|
||||
|
||||
ui_data = []
|
||||
config = [
|
||||
('web', 'push_ssl', 'false'),
|
||||
]
|
||||
for setting in ui_settings:
|
||||
# Todo: remove this section once transition to *.ini files will be completed
|
||||
if setting.section in ('largefiles', 'vcs_git_lfs'):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue