diff options
| author | Marcin Kuzminski <marcin@python-works.com> | 2012-07-26 23:03:26 +0200 |
|---|---|---|
| committer | Marcin Kuzminski <marcin@python-works.com> | 2012-07-26 23:03:26 +0200 |
| commit | 516a5ffd447fe28cd6d865602ac8d6c07f6be026 (patch) | |
| tree | bf8e836ab9fa07eb63b1bbeb3d9a2f6b91468622 /rhodecode/model/db.py | |
| parent | a83575c4e7e311490d0edbadc69d98ef0ed455e5 (diff) | |
Implementes #509 require SSL flag now works for both git and mercurial.
- check is done at earlies possible stage
- if detected protocol is not https and flag require is there RhodeCode will
return HTTP Error 406: Not Acceptable, before even checking credentials
- removed push_ssl flag from mercurial UI objects since that would duplicate logic
--HG--
branch : beta
Diffstat (limited to 'rhodecode/model/db.py')
| -rwxr-xr-x | rhodecode/model/db.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py index 045bb97a..5254d6cf 100755 --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -728,7 +728,7 @@ class Repository(Base, BaseModel): hg_ui = ret for ui_ in hg_ui: - if ui_.ui_active: + if ui_.ui_active and ui_.ui_key != 'push_ssl': 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) |