diff --git a/rhodecode/lib/vcs/backends/git/repository.py b/rhodecode/lib/vcs/backends/git/repository.py --- a/rhodecode/lib/vcs/backends/git/repository.py +++ b/rhodecode/lib/vcs/backends/git/repository.py @@ -329,7 +329,7 @@ class GitRepository(BaseRepository): @LazyProperty def _parsed_refs(self): refs = self._repo.get_refs() - keys = [('refs/heads/', 'H'), + keys = [('refs/heads/', 'H'), ('refs/remotes/origin/', 'RH'), ('refs/tags/', 'T')] _refs = {} diff --git a/rhodecode/templates/admin/users/user_edit.html b/rhodecode/templates/admin/users/user_edit.html --- a/rhodecode/templates/admin/users/user_edit.html +++ b/rhodecode/templates/admin/users/user_edit.html @@ -162,7 +162,7 @@
%for section in sorted(c.perm_user.permissions.keys()):
${section.replace("_"," ").capitalize()}
- +
@@ -202,6 +202,6 @@
%endfor -
+ diff --git a/rhodecode/templates/base/root.html b/rhodecode/templates/base/root.html --- a/rhodecode/templates/base/root.html +++ b/rhodecode/templates/base/root.html @@ -45,7 +45,7 @@ 'Group':"${_('Group')}", 'members':"${_('members')}", 'search truncated': "${_('search truncated')}", - 'no matching files': "${_('no matching files')}" + 'no matching files': "${_('no matching files')}" }; var _TM = TRANSLATION_MAP; diff --git a/rhodecode/templates/changeset/changeset_range.html b/rhodecode/templates/changeset/changeset_range.html --- a/rhodecode/templates/changeset/changeset_range.html +++ b/rhodecode/templates/changeset/changeset_range.html @@ -64,7 +64,7 @@ ##${comment.comment_inline_form(cs)} ## diff block

${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

- + ${diff_block.diff_block(c.changes[cs.raw_id])} ##${comment.comments(cs)} diff --git a/rhodecode/tests/vcs/base.py b/rhodecode/tests/vcs/base.py --- a/rhodecode/tests/vcs/base.py +++ b/rhodecode/tests/vcs/base.py @@ -76,7 +76,7 @@ class BackendTestMixin(object): cls.imc.change(FileNode(node.path, content=node.content)) for node in commit.get('removed', []): cls.imc.remove(FileNode(node.path)) - + cls.tip = cls.imc.commit(message=unicode(commit['message']), author=unicode(commit['author']), date=commit['date'])