##// END OF EJS Templates
pullrequest: disable pr on commits that dont share ancestor
dan -
r64:0b85876a default
parent child Browse files
Show More
@@ -198,7 +198,9 b' class CompareController(BaseRepoControll'
198 c.statuses = c.rhodecode_db_repo.statuses(
198 c.statuses = c.rhodecode_db_repo.statuses(
199 [x.raw_id for x in c.commit_ranges])
199 [x.raw_id for x in c.commit_ranges])
200
200
201 if partial:
201 if partial: # for PR ajax commits loader
202 if not c.ancestor:
203 return '' # cannot merge if there is no ancestor
202 return render('compare/compare_commits.html')
204 return render('compare/compare_commits.html')
203
205
204 if c.ancestor:
206 if c.ancestor:
General Comments 0
You need to be logged in to leave comments. Login now