summaryrefslogtreecommitdiff
path: root/lib/api/pipelines.rb
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-03-03 20:31:25 +0000
committerRobert Speicher <robert@gitlab.com>2017-03-03 20:31:25 +0000
commite19bcc7b6d56063a9a7a785d7247c5571d5dcc51 (patch)
tree5961b2b9dc3b04ff6b13405c0088a0fcbbca3d4f /lib/api/pipelines.rb
parentafd566347fe604d633adfebf0cd8277b860f52e0 (diff)
parent59e7d04bc78a69137b649dc8ac470a6c3eedbd3c (diff)
downloadgitlab-ce-e19bcc7b6d56063a9a7a785d7247c5571d5dcc51.tar.gz
Merge branch '26847-api-pipelines-use-basic' into 'master'
Expose pipelines as PipelineBasic `api/v4/projects/:id/pipelines` Closes #26847 See merge request !8875
Diffstat (limited to 'lib/api/pipelines.rb')
-rw-r--r--lib/api/pipelines.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/pipelines.rb b/lib/api/pipelines.rb
index 3afc1e385fe..0721b975ba4 100644
--- a/lib/api/pipelines.rb
+++ b/lib/api/pipelines.rb
@@ -10,7 +10,7 @@ module API
resource :projects do
desc 'Get all Pipelines of the project' do
detail 'This feature was introduced in GitLab 8.11.'
- success Entities::Pipeline
+ success Entities::PipelineBasic
end
params do
use :pagination
@@ -21,7 +21,7 @@ module API
authorize! :read_pipeline, user_project
pipelines = PipelinesFinder.new(user_project).execute(scope: params[:scope])
- present paginate(pipelines), with: Entities::Pipeline
+ present paginate(pipelines), with: Entities::PipelineBasic
end
desc 'Create a new pipeline' do