Commit b696cbc5 authored by Robert Speicher's avatar Robert Speicher

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

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

See merge request !9732
parents 35427246 2f040916
module API module API
# Deployments RESTfull API endpoints # Deployments RESTful API endpoints
class Deployments < Grape::API class Deployments < Grape::API
include PaginationParams include PaginationParams
......
module API module API
# Deployments RESTfull API endpoints module V3
class Deployments < Grape::API # Deployments RESTful API endpoints
include PaginationParams 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 params do
use :pagination requires :id, type: String, desc: 'The project ID'
end end
get ':id/deployments' do resource :projects do
authorize! :read_deployment, user_project 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 present paginate(user_project.deployments), with: ::API::V3::Deployments
end end
desc 'Gets a specific deployment' do desc 'Gets a specific deployment' do
detail 'This feature was introduced in GitLab 8.11.' detail 'This feature was introduced in GitLab 8.11.'
success ::API::V3::Deployments success ::API::V3::Deployments
end end
params do params do
requires :deployment_id, type: Integer, desc: 'The deployment ID' requires :deployment_id, type: Integer, desc: 'The deployment ID'
end end
get ':id/deployments/:deployment_id' do get ':id/deployments/:deployment_id' do
authorize! :read_deployment, user_project 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 end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment