diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2017-02-28 14:23:58 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-03-07 13:56:00 +0530 |
| commit | 519bac658ae7e92e8454d7ed6445cf286c12fcb6 (patch) | |
| tree | b5f28da8008c418dc9d82f467cedbc07793ff971 /spec/requests/api/v3/merge_requests_spec.rb | |
| parent | 9ccd8b8755d8c99a1c519d7251e7373df9812513 (diff) | |
| download | gitlab-ce-519bac658ae7e92e8454d7ed6445cf286c12fcb6.tar.gz | |
Fix time tracking endpoints for API v4
- Use issue/merge_request IID instead of ID
- Duplicate the original `TimeTrackingEndpoints` concern (+ specs) for V3, since
this is a breaking change.
Diffstat (limited to 'spec/requests/api/v3/merge_requests_spec.rb')
| -rw-r--r-- | spec/requests/api/v3/merge_requests_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/v3/merge_requests_spec.rb b/spec/requests/api/v3/merge_requests_spec.rb index b7ed643bc21..d73e9635c9b 100644 --- a/spec/requests/api/v3/merge_requests_spec.rb +++ b/spec/requests/api/v3/merge_requests_spec.rb @@ -712,7 +712,7 @@ describe API::MergeRequests, api: true do describe 'Time tracking' do let(:issuable) { merge_request } - include_examples 'time tracking endpoints', 'merge_request' + include_examples 'V3 time tracking endpoints', 'merge_request' end def mr_with_later_created_and_updated_at_time |