diff --git a/kallithea/lib/utils.py b/kallithea/lib/utils.py --- a/kallithea/lib/utils.py +++ b/kallithea/lib/utils.py @@ -247,7 +247,7 @@ def get_filesystem_repos(path, recursive continue #check if this dir containts other repos for recursive scan rec_path = os.path.join(p, dirpath) - if os.path.isdir(rec_path): + if not os.path.islink(rec_path) and os.path.isdir(rec_path): for inner_scm in _get_repos(rec_path): yield inner_scm diff --git a/kallithea/model/pull_request.py b/kallithea/model/pull_request.py --- a/kallithea/model/pull_request.py +++ b/kallithea/model/pull_request.py @@ -125,8 +125,9 @@ class PullRequestModel(BaseModel): #notification to reviewers pr_url = pr.url(canonical=True) - threading = [h.canonical_url('pullrequest_show', repo_name=pr.other_repo.repo_name, - pull_request_id=pr.pull_request_id)] + threading = ['%s-pr-%s@%s' % (pr.other_repo.repo_name, + pr.pull_request_id, + h.canonical_hostname())] subject = safe_unicode( h.link_to( _('%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s') % \ diff --git a/kallithea/templates/changeset/changeset.html b/kallithea/templates/changeset/changeset.html --- a/kallithea/templates/changeset/changeset.html +++ b/kallithea/templates/changeset/changeset.html @@ -283,7 +283,12 @@ ${self.repo_context_bar('changelog', c.c }); e.preventDefault(); } - }) + }); + + // hack: re-navigate to target after JS is done ... if a target is set and setting href thus won't reload + if (window.location.hash != "") { + window.location.href = window.location.href; + } }) diff --git a/kallithea/templates/files/files.html b/kallithea/templates/files/files.html --- a/kallithea/templates/files/files.html +++ b/kallithea/templates/files/files.html @@ -240,7 +240,7 @@ $(document).ready(function(){ var selected = e.currentTarget.options[e.currentTarget.selectedIndex].value; if(selected && selected != "${c.changeset.raw_id}"){ window.location = pyroutes.url('files_home', {'repo_name': "${h.safe_unicode(c.repo_name)}", 'revision': selected, 'f_path': "${h.safe_unicode(c.file.path)}"}); - $("#browserblock").hide(); + $("#body.browserblock").hide(); } else { $("#branch_selector").val("${c.changeset.raw_id}"); }