Show More
@@ -312,10 +312,14 b" def make_ui(read_from='file', path=None," | |||||
312 |
|
312 | |||
313 | hg_ui = ret |
|
313 | hg_ui = ret | |
314 | for ui_ in hg_ui: |
|
314 | for ui_ in hg_ui: | |
315 |
if ui_.ui_active |
|
315 | if ui_.ui_active: | |
316 | log.debug('settings ui from db[%s]%s:%s', ui_.ui_section, |
|
316 | log.debug('settings ui from db[%s]%s:%s', ui_.ui_section, | |
317 | ui_.ui_key, ui_.ui_value) |
|
317 | ui_.ui_key, ui_.ui_value) | |
318 | baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value) |
|
318 | baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value) | |
|
319 | if ui_.ui_key == 'push_ssl': | |||
|
320 | # force set push_ssl requirement to False, rhodecode | |||
|
321 | # handles that | |||
|
322 | baseui.setconfig(ui_.ui_section, ui_.ui_key, False) | |||
319 |
|
323 | |||
320 | meta.Session.remove() |
|
324 | meta.Session.remove() | |
321 | return baseui |
|
325 | return baseui |
@@ -735,10 +735,14 b' class Repository(Base, BaseModel):' | |||||
735 |
|
735 | |||
736 | hg_ui = ret |
|
736 | hg_ui = ret | |
737 | for ui_ in hg_ui: |
|
737 | for ui_ in hg_ui: | |
738 |
if ui_.ui_active |
|
738 | if ui_.ui_active: | |
739 | log.debug('settings ui from db[%s]%s:%s', ui_.ui_section, |
|
739 | log.debug('settings ui from db[%s]%s:%s', ui_.ui_section, | |
740 | ui_.ui_key, ui_.ui_value) |
|
740 | ui_.ui_key, ui_.ui_value) | |
741 | baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value) |
|
741 | baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value) | |
|
742 | if ui_.ui_key == 'push_ssl': | |||
|
743 | # force set push_ssl requirement to False, rhodecode | |||
|
744 | # handles that | |||
|
745 | baseui.setconfig(ui_.ui_section, ui_.ui_key, False) | |||
742 |
|
746 | |||
743 | return baseui |
|
747 | return baseui | |
744 |
|
748 |
General Comments 0
You need to be logged in to leave comments.
Login now