Commit ed37021c authored by Lisanne Fellinger's avatar Lisanne Fellinger

Make merge request text after push clearer

Add changelog entry

Editing changelog entry version
parent e1b0aca1
v4.1.0 v4.1.0
- Add support for global custom hooks and chained hook directories (Elan Ruusamäe, Dirk Hörner), !93, !89, #32 - 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 v4.0.3
- Fetch repositories with `--prune` option by default - Fetch repositories with `--prune` option by default
......
...@@ -56,7 +56,7 @@ class GitlabPostReceive ...@@ -56,7 +56,7 @@ class GitlabPostReceive
def print_merge_request_link(merge_request) def print_merge_request_link(merge_request)
if merge_request["new_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 else
message = "View merge request for #{merge_request["branch_name"]}:" message = "View merge request for #{merge_request["branch_name"]}:"
end end
......
...@@ -49,7 +49,7 @@ describe GitlabPostReceive do ...@@ -49,7 +49,7 @@ describe GitlabPostReceive do
expect(gitlab_post_receive).to receive(:puts).ordered expect(gitlab_post_receive).to receive(:puts).ordered
expect(gitlab_post_receive).to receive(:puts).with( expect(gitlab_post_receive).to receive(:puts).with(
"Create merge request for new_branch:" "To create a merge request for new_branch, visit:"
).ordered ).ordered
expect(gitlab_post_receive).to receive(:puts).with( expect(gitlab_post_receive).to receive(:puts).with(
" http://localhost/dzaporozhets/gitlab-ci/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch" " http://localhost/dzaporozhets/gitlab-ci/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch"
...@@ -123,7 +123,7 @@ describe GitlabPostReceive do ...@@ -123,7 +123,7 @@ describe GitlabPostReceive do
expect(gitlab_post_receive).to receive(:puts).ordered expect(gitlab_post_receive).to receive(:puts).ordered
expect(gitlab_post_receive).to receive(:puts).with( expect(gitlab_post_receive).to receive(:puts).with(
"Create merge request for new_branch:" "To create a merge request for new_branch, visit:"
).ordered ).ordered
expect(gitlab_post_receive).to receive(:puts).with( expect(gitlab_post_receive).to receive(:puts).with(
" http://localhost/dzaporozhets/gitlab-ci/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch" " http://localhost/dzaporozhets/gitlab-ci/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment