Mercurial > kallithea
comparison rhodecode/lib/utils.py @ 2689:73cfc54c87d5 beta
fixed the push_ssl issues after mercurial 2.3 upgrade.
Set always to false, since rhodecode handles that by dedicated middleware.
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 04 Aug 2012 19:28:38 +0200 |
parents | 2b6939a77052 |
children | 4c71667160e5 |
comparison
equal
deleted
inserted
replaced
2688:2df8982bc40c | 2689:73cfc54c87d5 |
---|---|
310 .options(FromCache("sql_cache_short", "get_hg_ui_settings"))\ | 310 .options(FromCache("sql_cache_short", "get_hg_ui_settings"))\ |
311 .all() | 311 .all() |
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 and ui_.ui_key != 'push_ssl': | 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 |
322 | 326 |
323 | 327 |