From 8239ba8faf0a018832626e41a4ec5ccba9fb6d60 Mon Sep 17 00:00:00 2001 From: Joe Robinson Date: Fri, 11 Dec 2015 17:20:01 +0000 Subject: Don't post merge request updates --- .../java/uk/co/blatech/blaears/controllers/GitMergeController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') 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 a323376..dc65f12 100644 --- a/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java +++ b/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java @@ -29,7 +29,8 @@ public class GitMergeController { action = " merged from branch "; } else if (!mergeMsg.getObjectAttributes().getAction().equals("update")){ action = " did a " + mergeMsg.getObjectAttributes().getAction() + " from "; -// return "gitlab"; + } else { + return "gitlab"; } String user = mergeMsg.getUser().getUsername(); -- cgit v1.2.3