diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-09 10:27:51 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-09 10:27:51 +0000 |
| commit | 8e370b37e16dc8eebeca264c6c351dc4a4fdab4a (patch) | |
| tree | e3eb8ac66c5cf3323cc9f794e34e1826aad39e19 /spec | |
| parent | e1b0aca197cb61a4ee33b8de37b79c57bb3369ad (diff) | |
| parent | ed37021cc296f4b3dda0d933c3b25cf212a29e5c (diff) | |
| download | gitlab-shell-8e370b37e16dc8eebeca264c6c351dc4a4fdab4a.tar.gz | |
Merge branch '21451-change-merge-request-text-after-pushing-new-branch' into 'master'
Make merge request text after push clearer
The message to create a merge request after pushing a new branch was not clear. It is now clear that it is optional to create a merge request for the pushed branch.
Part of [#21451](https://gitlab.com/gitlab-org/gitlab-ce/issues/21451)
See merge request !109
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/gitlab_post_receive_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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" |