Merge branch 'master' into 31156-environments-vue-service31156-environments-vue-service

* master: (91 commits)
  Move api lint out of static analysis job
  Fix project tree saver and fork spec failures
  Fix lazy error handling of cron parser
  Use gitlab-workhorse 2.0.0
  Revert to real click seeing as that was a bug with only the original branch
  Fixed issue_sidebar_spec.rb click as true click cannot hit the right element and removed sleep
  find and match first dropdown before clicking
  Elaborate on the usage of Spring
  Note Ghost user and refer to user deletion documentation
  Fix label creation from issuable for subgroup projects
  Detect already enabled DeployKeys in EnableDeployKeyService
  Extract common parts of snippet and blob pages into partial
  update article date
  link ldap-ee article from auth index
  add ldap article and changes from !10299
  Fix misaligned buttons in wiki pages
  Improve pipelines_finder.rb
  Improve documentation
  Correct typo in pipelines_spec.rb
  Avoid using sample
  ...

1 files changed, 13 insertions, 3 deletions

diff --git a/lib/api/pipelines.rb b/lib/api/pipelines.rb
index 754c3d85a04..9117704aa46 100644
--- a/lib/api/pipelines.rb
+++ b/lib/api/pipelines.rb
@@ -14,13 +14,23 @@ module API
       end
       params do
         use :pagination
-        optional :scope,    type: String, values: %w(running branches tags),
-                            desc: 'Either running, branches, or tags'
+        optional :scope,    type: String, values: %w[running pending finished branches tags],
+                            desc: 'The scope of pipelines'
+        optional :status,   type: String, values: HasStatus::AVAILABLE_STATUSES,
+                            desc: 'The status of pipelines'
+        optional :ref,      type: String, desc: 'The ref of pipelines'
+        optional :yaml_errors, type: Boolean, desc: 'Returns pipelines with invalid configurations'
+        optional :name,     type: String, desc: 'The name of the user who triggered pipelines'
+        optional :username, type: String, desc: 'The username of the user who triggered pipelines'
+        optional :order_by, type: String, values: PipelinesFinder::ALLOWED_INDEXED_COLUMNS, default: 'id',
+                            desc: 'Order pipelines'
+        optional :sort,     type: String, values: %w[asc desc], default: 'desc',
+                            desc: 'Sort pipelines'
       end
       get ':id/pipelines' do
         authorize! :read_pipeline, user_project
 
-        pipelines = PipelinesFinder.new(user_project).execute(scope: params[:scope])
+        pipelines = PipelinesFinder.new(user_project, params).execute
         present paginate(pipelines), with: Entities::PipelineBasic
       end