diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py --- a/rhodecode/lib/base.py +++ b/rhodecode/lib/base.py @@ -34,7 +34,7 @@ log = logging.getLogger(__name__) def _filter_proxy(ip): """ - HEADERS can have mutliple ips inside the left-most being the original + HEADERS can have multiple ips inside the left-most being the original client, and each successive proxy that passed the request adding the IP address where it received the request from. diff --git a/rhodecode/lib/paster_commands/repo_scan.py b/rhodecode/lib/paster_commands/repo_scan.py --- a/rhodecode/lib/paster_commands/repo_scan.py +++ b/rhodecode/lib/paster_commands/repo_scan.py @@ -58,9 +58,9 @@ class Command(BasePasterCommand): log.info('Now scanning root location for new repos...') added, removed = repo2db_mapper(ScmModel().repo_scan(), remove_obsolete=rm_obsolete) - added = ','.join(added) or '-' - removed = ','.join(removed) or '-' - log.info('Scan completed added:%s removed:%s' % (added, removed)) + added = ', '.join(added) or '-' + removed = ', '.join(removed) or '-' + log.info('Scan completed added: %s removed:%s' % (added, removed)) def update_parser(self): self.parser.add_option('--delete-obsolete', diff --git a/rhodecode/lib/vcs/utils/helpers.py b/rhodecode/lib/vcs/utils/helpers.py --- a/rhodecode/lib/vcs/utils/helpers.py +++ b/rhodecode/lib/vcs/utils/helpers.py @@ -50,7 +50,7 @@ def get_scm(path, search_up=False, expli if scm[0] == explicit_alias: return scm raise VCSError('More than one [%s] scm found at given path %s' - % (','.join((x[0] for x in found_scms)), path)) + % (', '.join((x[0] for x in found_scms)), path)) if len(found_scms) is 0: raise VCSError('No scm found at given path %s' % path) diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html --- a/rhodecode/templates/pullrequests/pullrequest_show.html +++ b/rhodecode/templates/pullrequests/pullrequest_show.html @@ -54,7 +54,7 @@