diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java | 2 |
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"; } |