Mercurial > kallithea
changeset 5103:7117a83b4b3a
Merge stable
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 07 May 2015 16:24:29 +0200 |
parents | 6101e27a7799 (current diff) a9d2e2958514 (diff) |
children | bacbf8936d5b |
files | kallithea/model/pull_request.py |
diffstat | 4 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/lib/utils.py Thu Apr 30 19:24:24 2015 +0000 +++ b/kallithea/lib/utils.py Thu May 07 16:24:29 2015 +0200 @@ -247,7 +247,7 @@ 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
--- a/kallithea/model/pull_request.py Thu Apr 30 19:24:24 2015 +0000 +++ b/kallithea/model/pull_request.py Thu May 07 16:24:29 2015 +0200 @@ -125,8 +125,9 @@ #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') % \
--- a/kallithea/templates/changeset/changeset.html Thu Apr 30 19:24:24 2015 +0000 +++ b/kallithea/templates/changeset/changeset.html Thu May 07 16:24:29 2015 +0200 @@ -283,7 +283,12 @@ }); 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; + } }) </script>
--- a/kallithea/templates/files/files.html Thu Apr 30 19:24:24 2015 +0000 +++ b/kallithea/templates/files/files.html Thu May 07 16:24:29 2015 +0200 @@ -240,7 +240,7 @@ 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}"); }