diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 06:08:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 06:08:47 +0300 |
| commit | 08ed6a867b690a04fe7a74c9ba697cf18f6107d7 (patch) | |
| tree | 9561a9aeee9a57cec168b143a76e6f65fd92ae0b /spec/requests/api/merge_requests_spec.rb | |
| parent | b0f27742e78a4aa4208c271536b6b9d84c53b49e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/api/merge_requests_spec.rb')
| -rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index d322c6de6bf..f604b13d3cc 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -2260,7 +2260,7 @@ describe API::MergeRequests do put api("/projects/#{project.id}/merge_requests/#{merge_request.iid}/rebase", user) expect(response).to have_gitlab_http_status(409) - expect(json_response['message']).to eq(MergeRequest::REBASE_LOCK_MESSAGE) + expect(json_response['message']).to eq('Failed to enqueue the rebase operation, possibly due to a long-lived transaction. Try again later.') end end |