From ed37021cc296f4b3dda0d933c3b25cf212a29e5c Mon Sep 17 00:00:00 2001
From: Lisanne Fellinger <lisanne.88@gmail.com>
Date: Mon, 28 Nov 2016 15:50:01 +0100
Subject: [PATCH] Make merge request text after push clearer
Add changelog entry
Editing changelog entry version
---
CHANGELOG | 1 +
lib/gitlab_post_receive.rb | 2 +-
spec/gitlab_post_receive_spec.rb | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 0caca15..68cc77b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
v4.1.0
- Add support for global custom hooks and chained hook directories (Elan Ruusamäe, Dirk Hörner), !93, !89, #32
+ - Clear up text with merge request after new branch push (Lisanne Fellinger)
v4.0.3
- Fetch repositories with `--prune` option by default
diff --git a/lib/gitlab_post_receive.rb b/lib/gitlab_post_receive.rb
index ffa6a15..7e3b310 100644
--- a/lib/gitlab_post_receive.rb
+++ b/lib/gitlab_post_receive.rb
@@ -56,7 +56,7 @@ class GitlabPostReceive
def print_merge_request_link(merge_request)
if merge_request["new_merge_request"]
- message = "Create merge request for #{merge_request["branch_name"]}:"
+ message = "To create a merge request for #{merge_request["branch_name"]}, visit:"
else
message = "View merge request for #{merge_request["branch_name"]}:"
end
diff --git a/spec/gitlab_post_receive_spec.rb b/spec/gitlab_post_receive_spec.rb
index bac6f97..711545f 100644
--- a/spec/gitlab_post_receive_spec.rb
+++ b/spec/gitlab_post_receive_spec.rb
@@ -49,7 +49,7 @@ describe GitlabPostReceive do
expect(gitlab_post_receive).to receive(:puts).ordered
expect(gitlab_post_receive).to receive(:puts).with(
- "Create merge request for new_branch:"
+ "To create a merge request for new_branch, visit:"
).ordered
expect(gitlab_post_receive).to receive(:puts).with(
" http://localhost/dzaporozhets/gitlab-ci/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch"
@@ -123,7 +123,7 @@ describe GitlabPostReceive do
expect(gitlab_post_receive).to receive(:puts).ordered
expect(gitlab_post_receive).to receive(:puts).with(
- "Create merge request for new_branch:"
+ "To create a merge request for new_branch, visit:"
).ordered
expect(gitlab_post_receive).to receive(:puts).with(
" http://localhost/dzaporozhets/gitlab-ci/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch"
--
GitLab