opendev/system-config
Code Issues Proposed changes

Merge "make merge conflict changes black"

Browse Source
This commit is contained in:
Jenkins 2014-01-18 00:15:58 +00:00 committed by Gerrit Code Review
commit 8f3e9280d6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
modules/openstack_project/files/zuul/black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 355 B

8
modules/openstack_project/files/zuul/status.js
View File

@ -227,8 +227,12 @@ function format_change(change, change_queue) {
html += '<td class="'+cls+'">';
if (i == change['_tree_index']) {
if (change['failing_reasons'] && change['failing_reasons'].length > 0) {
html += '<img src="red.png" title="Failing because '+
change['failing_reasons'].join(', ')+'"/>';
var reason = change['failing_reasons'].join(', ');
var image = 'red.png';
if (reason.match(/merge conflict/)) {
image = 'black.png';
}
html += '<img src="' + image + '" title="Failing because ' + reason +'"/>';
} else {
html += '<img src="green.png" title="Succeeding"/>';
}