diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-10-11 16:27:04 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-10-12 11:41:22 +0200 |
| commit | 71d71afb3ac5f302470e66ace4f59e247249d99e (patch) | |
| tree | 0d869436e2ab72454ebb117cc3808ad764652e55 /spec/requests/api | |
| parent | 75723034cee27d387d7ac7edb88d1520bb3a6b7b (diff) | |
| download | gitlab-ce-71d71afb3ac5f302470e66ace4f59e247249d99e.tar.gz | |
Allow getting the merge base of multiple revisions
As we now support getting the merge base for multiple revisions in
gitaly, we can provide this functionality in our API
Diffstat (limited to 'spec/requests/api')
| -rw-r--r-- | spec/requests/api/repositories_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/repositories_spec.rb b/spec/requests/api/repositories_spec.rb index 519638ebb82..fa38751fe58 100644 --- a/spec/requests/api/repositories_spec.rb +++ b/spec/requests/api/repositories_spec.rb @@ -468,7 +468,7 @@ describe API::Repositories do describe 'GET :id/repository/merge_base' do let(:refs) do - %w(304d257dcb821665ab5110318fc58a007bd104ed 0031876facac3f2b2702a0e53a26e89939a42209) + %w(304d257dcb821665ab5110318fc58a007bd104ed 0031876facac3f2b2702a0e53a26e89939a42209 570e7b2abdd848b95f2f578043fc23bd6f6fd24d) end subject(:request) do @@ -534,7 +534,7 @@ describe API::Repositories do request expect(response).to have_gitlab_http_status(:bad_request) - expect(json_response['message']).to eq('Provide exactly 2 refs') + expect(json_response['message']).to eq('Provide at least 2 refs') end end end |