summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoe Robinson <joe@lc8n.com>2015-12-11 01:16:28 +0000
committerJoe Robinson <joe@lc8n.com>2015-12-11 01:16:28 +0000
commit1b7a39a2ecfe5b1ccec246136e7f31f3b2a4bfde (patch)
tree64b75ce111da5fae9c1ff45ab0fa4248ece9b960 /src
parent3b649e6855ea849808473349f8213f1304f0c92a (diff)
Don't show messages about merge updates as these duplicate push messages
Diffstat (limited to 'src')
-rw-r--r--src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java2
1 files changed, 1 insertions, 1 deletions
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";
}