NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-17 08:25:46 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
961 Commits 242 Branches 2 Tags 48 MiB
Python 82.9%
JavaScript 16.4%
CSS 0.4%
SCSS 0.3%
4d528465d9
Go to file
Xavier Morel 4d528465d9 [FIX] forwardport: incorrect / misleading conflict message 
Given a PR batch getting forward-ported together, if one of the PRs
has a conflict the others should be considered "in conflict" as well,
and should have a note pointing in that direction and indicating that
the PR should be approved the normal way eventually. Which they do.

However, the message is confusing as it gets bolted on the normal
non-conflicting message, either noting that it's part of a chain
or (worse because it gives conflicting indication) the "terminal"
message recommending using the forwardbot to approve of the entire
chain.

I've no idea why I did it that way instead of just adding a case to
the conditional, and the commit message provides no indication. But
perform that change, it seems innocuous, hopefully there weren't good
reasons I forgot about for doing it the other way around.

Fixes #367
2020-05-20 07:43:53 +02:00
forwardport [FIX] forwardport: incorrect / misleading conflict message 2020-05-20 07:43:53 +02:00
runbot [FIX] runbot: send status only once. 2020-04-24 11:39:36 +02:00
runbot_builder [IMP] runbot: build docker image once per loop turn 2020-01-22 13:50:01 +01:00
runbot_cla [IMP] runbot: simplify views and adapt to odoo13 2020-01-14 13:24:58 +01:00
runbot_merge [FIX] runbot_merge: mistake in logging parameter 2020-04-17 08:09:01 +02:00
.gitignore [IMP] runbot: build docker image once per loop turn 2020-01-22 13:50:01 +01:00
conftest.py [IMP] runbot_merge: support for merging partners w/ github_login 2020-03-16 15:03:11 +01:00
README.md [REF] README: update the readme file for the brand new repo 2018-03-08 16:59:39 +01:00
requirements.txt [IMP] runbot: dynamic requirements 2019-12-02 16:36:56 +01:00

README.md

Odoo Runbot Repository

This repository contains the source code of Odoo testing bot runbot.odoo.com and related addons.

Runbot

The runbot/ directory holds the main runbot Odoo addon.

Runbot CLA addon

The runbot_cla/ directory contains an Odoo addon that checks CLA.