diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py --- a/rhodecode/lib/utils.py +++ b/rhodecode/lib/utils.py @@ -312,10 +312,14 @@ def make_ui(read_from='file', path=None, hg_ui = ret for ui_ in hg_ui: - if ui_.ui_active and ui_.ui_key != 'push_ssl': + if ui_.ui_active: log.debug('settings ui from db[%s]%s:%s', ui_.ui_section, ui_.ui_key, ui_.ui_value) baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value) + if ui_.ui_key == 'push_ssl': + # force set push_ssl requirement to False, rhodecode + # handles that + baseui.setconfig(ui_.ui_section, ui_.ui_key, False) meta.Session.remove() return baseui diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -735,10 +735,14 @@ class Repository(Base, BaseModel): hg_ui = ret for ui_ in hg_ui: - if ui_.ui_active and ui_.ui_key != 'push_ssl': + if ui_.ui_active: log.debug('settings ui from db[%s]%s:%s', ui_.ui_section, ui_.ui_key, ui_.ui_value) baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value) + if ui_.ui_key == 'push_ssl': + # force set push_ssl requirement to False, rhodecode + # handles that + baseui.setconfig(ui_.ui_section, ui_.ui_key, False) return baseui