diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-18 21:07:37 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-18 21:07:37 +0000 |
| commit | 7f8330873c1a5860b8a9a52d111083a65d210249 (patch) | |
| tree | e6c7019f2942b8d2fff313545b7cb4bb996b6870 /spec/requests/api/internal | |
| parent | bbe243060399191abcba33c7ebd611f6ec34c6cd (diff) | |
| download | gitlab-ce-7f8330873c1a5860b8a9a52d111083a65d210249.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/api/internal')
| -rw-r--r-- | spec/requests/api/internal/base_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/internal/base_spec.rb b/spec/requests/api/internal/base_spec.rb index d38b7eafe97..ecbb81294a0 100644 --- a/spec/requests/api/internal/base_spec.rb +++ b/spec/requests/api/internal/base_spec.rb @@ -852,7 +852,7 @@ describe API::Internal::Base do message = <<~MESSAGE.strip To create a merge request for #{branch_name}, visit: - http://#{Gitlab.config.gitlab.host}/#{project.full_path}/-/merge_requests/new?merge_request%5Bsource_branch%5D=#{branch_name} + http://#{Gitlab.config.gitlab.host}/#{project.full_path}/merge_requests/new?merge_request%5Bsource_branch%5D=#{branch_name} MESSAGE expect(json_response['messages']).to include(build_basic_message(message)) @@ -909,7 +909,7 @@ describe API::Internal::Base do message = <<~MESSAGE.strip View merge request for #{branch_name}: - http://#{Gitlab.config.gitlab.host}/#{project.full_path}/-/merge_requests/1 + http://#{Gitlab.config.gitlab.host}/#{project.full_path}/merge_requests/1 MESSAGE expect(json_response['messages']).to include(build_basic_message(message)) |