From d15fd0647ecd555db5a5f2f85d2af2197b2ebfe3 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean.dague@samsung.com>
Date: Fri, 10 Jan 2014 15:27:32 -0500
Subject: [PATCH] make merge conflict changes black

instead of using the red dot to be all fails, use a black dot to
represent a change which has a merge conflict. Then it's clearer
when something it off the subway map, why it is, without having
to mouse over the circle (which few people knew about).

Change-Id: Ia44292fa553538e8924993f92a7177dfae34111f
---
 modules/openstack_project/files/zuul/black.png | Bin 0 -> 355 bytes
 modules/openstack_project/files/zuul/status.js |   8 ++++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 modules/openstack_project/files/zuul/black.png

diff --git a/modules/openstack_project/files/zuul/black.png b/modules/openstack_project/files/zuul/black.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d1c61fb4fb94e5cf4d51c7f76123929c9673c0f
GIT binary patch
literal 355
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPqBbSJ%&Wif^1wbLm64!_l=ltB<)VvY~=c3falGGH1
z^30M91$R&1fbd2>aiF5po-U3d7N^%v-q_V@AmHl%$t8&UGTR>+#oVm=r+>S)uAOjf
z{l>`-3R7R+dGyht;?1M9?^lY?A1H92`@FI!ahBS&RK;T_3S~5w8XQwlvUo0W{G(Oh
zF0MV_b8a8=kI0_+{AaKM53{D~y9=eViYyFYsz2W~aPZ=MZ_CiX@BRGOyFNu1o!gRo
zdU58g^m8+%zSX)PmsqKKtV3^U2)CE!dgXttxjifSq?0cw1?dV1ZYf?D^<Yl5=|{iT
v{j0zH50O-8Y1sPh+OzT>kEOHk{p8NLo>$Cp?dx}-w-`KK{an^LB{Ts5%S?{w

literal 0
HcmV?d00001

diff --git a/modules/openstack_project/files/zuul/status.js b/modules/openstack_project/files/zuul/status.js
index 0c22ec3218..31054add80 100644
--- a/modules/openstack_project/files/zuul/status.js
+++ b/modules/openstack_project/files/zuul/status.js
@@ -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"/>';
             }