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: incorrect changes spec/order (depth)

Browse Source
This commit is contained in:
Xavier Morel 2018-06-07 14:50:11 +02:00 committed by xmo-odoo
parent f67bdd8c5e
commit 91937aac27
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runbot_merge/controllers.py
View File

@ -62,7 +62,7 @@ def handle_pr(event):
# is at event['change']['base']['ref'] (if the target changed), so edition
# handling must occur before the rest of the steps
if event['action'] == 'edited':
source = event['changes'].get('base', {'from': pr['base']})['from']['ref']
source = event['changes'].get('base', {'ref': {'from': b}})['ref']['from']
source_branch = env['runbot_merge.branch'].search([
('name', '=', source),
('project_id', '=', repo.project_id.id),

2
runbot_merge/tests/fake_github/__init__.py
View File

@ -492,7 +492,7 @@ class PR(Issue):
def base(self, value):
old, self._base = self._base, value
self.repo.notify('pull_request', 'edited', self, {
'base': {'from': {'ref': old}}
'base': {'ref': {'from': old}}
})
def push(self, sha):