diff --git a/kallithea/config/rcextensions/__init__.py b/kallithea/config/rcextensions/__init__.py --- a/kallithea/config/rcextensions/__init__.py +++ b/kallithea/config/rcextensions/__init__.py @@ -187,7 +187,6 @@ def _pushhook(*args, **kwargs): Post push hook kwargs available: - :param server_url: url of instance that triggered this hook :param config: path to .ini config used :param scm: type of VS 'git' or 'hg' :param username: name of user who pushed @@ -213,7 +212,6 @@ def _pullhook(*args, **kwargs): Post pull hook kwargs available:: - :param server_url: url of instance that triggered this hook :param config: path to .ini config used :param scm: type of VS 'git' or 'hg' :param username: name of user who pulled diff --git a/kallithea/lib/base.py b/kallithea/lib/base.py --- a/kallithea/lib/base.py +++ b/kallithea/lib/base.py @@ -49,7 +49,7 @@ from kallithea import __version__, BACKE from kallithea.config.routing import url from kallithea.lib.utils2 import str2bool, safe_unicode, AttributeDict, \ - safe_str, safe_int, get_server_url, _set_extras + safe_str, safe_int, _set_extras from kallithea.lib import auth_modules from kallithea.lib.auth import AuthUser, HasPermissionAnyMiddleware from kallithea.lib.compat import json @@ -340,7 +340,6 @@ class BaseVCSController(object): 'repository': parsed_request.repo_name, 'scm': self.scm_alias, 'config': CONFIG['__file__'], - 'server_url': get_server_url(environ), } #====================================================================== diff --git a/kallithea/lib/utils2.py b/kallithea/lib/utils2.py --- a/kallithea/lib/utils2.py +++ b/kallithea/lib/utils2.py @@ -518,11 +518,6 @@ def obfuscate_url_pw(engine): return str(_url) -def get_server_url(environ): - req = webob.Request(environ) - return req.host_url + req.script_name - - def _extract_extras(): """ Extracts the Kallithea extras data from os.environ, and wraps it into named diff --git a/kallithea/model/scm.py b/kallithea/model/scm.py --- a/kallithea/model/scm.py +++ b/kallithea/model/scm.py @@ -47,8 +47,7 @@ from kallithea.lib.vcs.backends.base imp from kallithea import BACKENDS from kallithea.lib import helpers as h -from kallithea.lib.utils2 import safe_str, safe_unicode, get_server_url, \ - _set_extras +from kallithea.lib.utils2 import safe_str, safe_unicode, _set_extras from kallithea.lib.auth import HasRepoPermissionLevel, HasRepoGroupPermissionLevel, \ HasUserGroupPermissionLevel, HasPermissionAny, HasPermissionAny from kallithea.lib.utils import get_filesystem_repos, make_ui, \ @@ -347,7 +346,6 @@ class ScmModel(object): 'repository': repo_name, 'scm': repo_alias, 'config': CONFIG['__file__'], - 'server_url': get_server_url(environ), } _set_extras(extras)