diff --git a/rhodecode/lib/middleware/simplegit.py b/rhodecode/lib/middleware/simplegit.py --- a/rhodecode/lib/middleware/simplegit.py +++ b/rhodecode/lib/middleware/simplegit.py @@ -159,7 +159,7 @@ class SimpleGit(object): #============================================================== if self.action in ['pull', 'push'] or self.action: - username = self.__get_environ_user(environ) + username = REMOTE_USER(environ) try: user = self.__get_user(username) self.username = user.username @@ -248,8 +248,6 @@ class SimpleGit(object): repo_name = repo_name.split('/')[0] return repo_name - def __get_environ_user(self, environ): - return environ.get('REMOTE_USER') def __get_user(self, username): return UserModel().get_by_username(username, cache=True) diff --git a/rhodecode/lib/middleware/simplehg.py b/rhodecode/lib/middleware/simplehg.py --- a/rhodecode/lib/middleware/simplehg.py +++ b/rhodecode/lib/middleware/simplehg.py @@ -126,7 +126,7 @@ class SimpleHg(object): #============================================================== if self.action in ['pull', 'push']: - username = self.__get_environ_user(environ) + username = REMOTE_USER(environ) try: user = self.__get_user(username) self.username = user.username @@ -220,9 +220,6 @@ class SimpleHg(object): return repo_name - def __get_environ_user(self, environ): - return environ.get('REMOTE_USER') - def __get_user(self, username): return UserModel().get_by_username(username, cache=True)