From 1b7a39a2ecfe5b1ccec246136e7f31f3b2a4bfde Mon Sep 17 00:00:00 2001
From: Joe Robinson <joe@lc8n.com>
Date: Fri, 11 Dec 2015 01:16:28 +0000
Subject: Don't show messages about merge updates as these duplicate push
 messages

---
 src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java')

diff --git a/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java b/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java
index 179caee..a323376 100644
--- a/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java
+++ b/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java
@@ -27,7 +27,7 @@ public class GitMergeController {
                 action = " created a merge request from ";
             } else if (mergeMsg.getObjectAttributes().getAction().equals("merge")) {
                 action = " merged from branch ";
-            } else {
+            } else if (!mergeMsg.getObjectAttributes().getAction().equals("update")){
                 action = " did a " + mergeMsg.getObjectAttributes().getAction() + " from ";
 //                return "gitlab";
             }
-- 
cgit v1.2.3