Merge branch 'rs-fix-deployments-v3-namespace' into 'master'

Move `api/v3/deployments` to the correct namespace

See merge request !9732
This commit is contained in:
Robert Speicher 2017-03-06 18:45:09 +00:00
commit b696cbc5a0
2 changed files with 31 additions and 29 deletions

View File

@ -1,5 +1,5 @@
module API
# Deployments RESTfull API endpoints
# Deployments RESTful API endpoints
class Deployments < Grape::API
include PaginationParams

View File

@ -1,40 +1,42 @@
module API
# Deployments RESTfull API endpoints
class Deployments < Grape::API
include PaginationParams
module V3
# Deployments RESTful API endpoints
class Deployments < Grape::API
include PaginationParams
before { authenticate! }
before { authenticate! }
params do
requires :id, type: String, desc: 'The project ID'
end
resource :projects do
desc 'Get all deployments of the project' do
detail 'This feature was introduced in GitLab 8.11.'
success ::API::V3::Deployments
end
params do
use :pagination
requires :id, type: String, desc: 'The project ID'
end
get ':id/deployments' do
authorize! :read_deployment, user_project
resource :projects do
desc 'Get all deployments of the project' do
detail 'This feature was introduced in GitLab 8.11.'
success ::API::V3::Deployments
end
params do
use :pagination
end
get ':id/deployments' do
authorize! :read_deployment, user_project
present paginate(user_project.deployments), with: ::API::V3::Deployments
end
present paginate(user_project.deployments), with: ::API::V3::Deployments
end
desc 'Gets a specific deployment' do
detail 'This feature was introduced in GitLab 8.11.'
success ::API::V3::Deployments
end
params do
requires :deployment_id, type: Integer, desc: 'The deployment ID'
end
get ':id/deployments/:deployment_id' do
authorize! :read_deployment, user_project
desc 'Gets a specific deployment' do
detail 'This feature was introduced in GitLab 8.11.'
success ::API::V3::Deployments
end
params do
requires :deployment_id, type: Integer, desc: 'The deployment ID'
end
get ':id/deployments/:deployment_id' do
authorize! :read_deployment, user_project
deployment = user_project.deployments.find(params[:deployment_id])
deployment = user_project.deployments.find(params[:deployment_id])
present deployment, with: ::API::V3::Deployments
present deployment, with: ::API::V3::Deployments
end
end
end
end