summaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java3
1 files changed, 2 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 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();