diff options
| author | Imre Farkas <ifarkas@gitlab.com> | 2018-11-08 15:18:17 +0300 |
|---|---|---|
| committer | Imre Farkas <ifarkas@gitlab.com> | 2018-11-28 14:54:11 +0300 |
| commit | b1e070bf4957a558ac51315dd4a6277056047e8a (patch) | |
| tree | 07f98719501b51e58f62762aaca80b7239d53231 /lib/api/merge_requests.rb | |
| parent | 1cd570cf77b79f37f30ef3ccd399c337056aa236 (diff) | |
Fix API::Namespaces to accept namepaces with dots
It also renames the API::PROJECT_ENDPOINT_REQUIREMENTS constant to
API::NAMESPACE_OR_PROJECT_REQUIREMENTS
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 16f07f16387..957020b60ef 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -122,7 +122,7 @@ module API params do requires :id, type: String, desc: 'The ID of a group' end - resource :groups, requirements: API::PROJECT_ENDPOINT_REQUIREMENTS do + resource :groups, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do desc 'Get a list of group merge requests' do success Entities::MergeRequestBasic end @@ -141,7 +141,7 @@ module API params do requires :id, type: String, desc: 'The ID of a project' end - resource :projects, requirements: API::PROJECT_ENDPOINT_REQUIREMENTS do + resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do include TimeTrackingEndpoints helpers do |