diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-03-06 17:12:49 +0100 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-03-06 17:12:49 +0100 |
commit | 0e5d065848aa3149efcb5248293f265699b5b57c (patch) | |
tree | 8c9c725befc4847bf963f636a7210ac1fce3778a /lib/api/pipelines.rb | |
parent | 46d99dedfbe10dc36c79c6f09d886ad2fc2192b5 (diff) | |
parent | 348dff0a826c45f00f992e761423a22d2ac32bc3 (diff) | |
download | gitlab-ce-23993-drop-ci_projects.tar.gz |
Merge remote-tracking branch 'origin/master' into 23993-drop-ci_projects23993-drop-ci_projects
Diffstat (limited to 'lib/api/pipelines.rb')
-rw-r--r-- | lib/api/pipelines.rb | 4 |
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 |