diff --git a/CHANGELOG b/CHANGELOG index 0caca15f8d33e7c6ad1a4f4d11b13b5c08ca4692..68cc77b16d5d18cf680181d6cc51ed3223ac176b 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 ffa6a15ecf9b5b0603a95465f19c31dabcc6b95f..7e3b31003ffa2d17cba414698aeaa8209925c046 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 bac6f979b637213659a1dd9656c642fc47f32536..711545f83469569e2f194f3a6c819387ca37becd 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"