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

[FIX] runbot_merge: type error in conflict handling

Browse Source
This commit is contained in:
Xavier Morel 2024-06-10 14:29:55 +02:00
parent 4af515b20d
commit 14a2b0068d
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

@ -1430,7 +1430,7 @@ class PullRequests(models.Model):
template = 'runbot_merge.forwardport.linked'
format_args = {
'pr': self,
'siblings': ', '.join(p.display_name for p in (self.batch_id - self)),
'siblings': ', '.join(p.display_name for p in (self.batch_id.prs - self)),
'footer': FOOTER,
}
elif not self._find_next_target():