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

[FIX] runbot_merge: remove commit from message when closing a PR

Browse Source 
As noted in the old comment, the provided commit was the head of the
staging branch. This confused many users as they'd click the link
expecting to see their commit and potentially got something completely
unrelated.

Since we already get backlinks from the commit through the "closes
<pr_number>" added either by the committer or by the bot itself, the
information is already available.
This commit is contained in:
Xavier Morel 2018-10-12 16:52:42 +02:00
parent bab7e25a9a
commit 41400f791b
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runbot_merge/models/pull_requests.py
View File

@ -964,9 +964,7 @@ class Stagings(models.Model):
)
prs.write({'state': 'merged'})
for pr in prs:
# FIXME: this is the staging head rather than the actual merge commit for the PR
staging_head = staging_heads.get(pr.repository.name + '^') or staging_heads[pr.repository.name]
gh[pr.repository.name].close(pr.number, 'Merged in {}'.format(staging_head))
gh[pr.repository.name].close(pr.number, 'Merged, thanks!')
finally:
self.batch_ids.write({'active': False})
self.write({'active': False})