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

[IMP] runbot_merge: add style for successful but unmerged staging

Browse Source 
Currently the PR becomes successful-green as soon as CI fully passes
but before it's merged, which can be an issue as e.g. merging might be
delayed (there's no visible difference between "CI success" and
"staging merged") or it might ultimately failed (FF error).

Create an intermediate color for "successful" stagings which are still
pending merge.

Also add a fallback message for fast-forward errors instead of en
empty string.

Closes #308
This commit is contained in:
Xavier Morel 2020-03-12 11:05:49 +01:00
parent f60bc1d067
commit 974bab40ba
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
runbot_merge/static/scss/runbot_merge.scss
View File

@ -18,6 +18,9 @@ h5 { font-size: 1em; }
.bg-success {
background-color: #dff0d8 !important;
}
.bg-unmerged {
background-color: #dcefe8 !important
}
.bg-info {
background-color: #d9edf7 !important;
}

2
runbot_merge/views/templates.xml
View File

@ -121,7 +121,7 @@
<t t-set="failure" t-value="staging.state == 'failure'"/>
<t t-set="pending" t-value="staging.active and (not staging.state or staging.state == 'pending')"/>
<t t-set="stateclass">
<t t-if="success">bg-success</t>
<t t-if="success">bg-success <t t-if="staging.active">bg-unmerged</t></t>
<t t-if="failure">bg-danger</t>
<t t-if="pending">bg-info</t>
<t t-if="not (success or failure or pending)">bg-gray-lighter</t>