NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 05:15:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot_merge: small typo in error message

Browse Source
This commit is contained in:
xmo-odoo 2019-03-06 22:50:55 +01:00 committed by GitHub
parent 8d011e03d2
commit 4944d6a503
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runbot_merge/models/pull_requests.py
View File

@ -884,7 +884,7 @@ class PullRequests(models.Model):
commits = prdict['commits'] commits = prdict['commits']
method = self.merge_method or ('rebase-ff' if commits == 1 else None) method = self.merge_method or ('rebase-ff' if commits == 1 else None)
assert commits < 50 or not method.startswith('rebase'), \ assert commits < 50 or not method.startswith('rebase'), \
"rebasing a PR or more than 50 commits is a tad excessive" "rebasing a PR of more than 50 commits is a tad excessive"
assert commits < 250, "merging PRs of 250+ commits is not supported (https://developer.github.com/v3/pulls/#list-commits-on-a-pull-request)" assert commits < 250, "merging PRs of 250+ commits is not supported (https://developer.github.com/v3/pulls/#list-commits-on-a-pull-request)"
pr_commits = gh.commits(self.number) pr_commits = gh.commits(self.number)