Merge branch 'readme' into 'master'

Update readme

Testing hooks

See merge request !1

2 files changed, 4 insertions, 2 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 5622aea..09c7134 100644
--- a/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java
+++ b/src/main/java/uk/co/blatech/blaears/controllers/GitMergeController.java
@@ -28,10 +28,11 @@ public class GitMergeController {
             } else if (mergeMsg.getObjectKind().equals("merge")) {
                 action = " merged from branch ";
             } else {
-                return "gitlab";
+                action = " did a " + mergeMsg.getObjectKind() + " from ";
+//                return "gitlab";
             }
             //DANGER
-            Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", "echo theblueroom " + mergeMsg.getUser().getUserName()+ " created a merge request from " + mergeMsg.getObjectAttributes().getSourceBranch() + " to " + mergeMsg.getObjectAttributes().getTargetBranch()  + ": " + mergeMsg.getUrl() + " | bash /home/smsd/msgrelay.bash "});
+            Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", "echo theblueroom " + mergeMsg.getUser().getUserName() + action + mergeMsg.getObjectAttributes().getSourceBranch() + " to " + mergeMsg.getObjectAttributes().getTargetBranch()  + ": " + mergeMsg.getUrl() + " | bash /home/smsd/msgrelay.bash "});
             model.addAttribute("result", "OK");
         } catch (IOException e) {
             System.out.println("Failed to run command");
diff --git a/src/main/java/uk/co/blatech/blaears/controllers/GitPushController.java b/src/main/java/uk/co/blatech/blaears/controllers/GitPushController.java
index 85592c8..2e8020b 100644
--- a/src/main/java/uk/co/blatech/blaears/controllers/GitPushController.java
+++ b/src/main/java/uk/co/blatech/blaears/controllers/GitPushController.java
@@ -26,6 +26,7 @@ public class GitPushController {
                 if (StringUtils.isNotEmpty(commitMsg)) {
                     commitMsg += ", ";
                 }
+                commitMsg += commit.getMessage();
             }
             //DANGER
             Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", "echo theblueroom " + pushMsg.getUserName() + " pushed to " + pushMsg.getRepository().getName() + ": "+ commitMsg + " | bash /home/smsd/msgrelay.bash "});