# HG changeset patch # User Daniel Dourvaris # Date 2016-05-31 18:50:14 # Node ID 0b85876a7b1d5d99d68d76b8d80820e5036bedc3 # Parent ce662a0fb3757d487aefe6dd32c8012338a5678e pullrequest: disable pr on commits that dont share ancestor diff --git a/rhodecode/controllers/compare.py b/rhodecode/controllers/compare.py --- a/rhodecode/controllers/compare.py +++ b/rhodecode/controllers/compare.py @@ -198,7 +198,9 @@ class CompareController(BaseRepoControll c.statuses = c.rhodecode_db_repo.statuses( [x.raw_id for x in c.commit_ranges]) - if partial: + if partial: # for PR ajax commits loader + if not c.ancestor: + return '' # cannot merge if there is no ancestor return render('compare/compare_commits.html') if c.ancestor: