diff options
| author | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-03-08 21:18:09 +0900 |
|---|---|---|
| committer | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-05-03 02:11:51 +0900 |
| commit | 9324a464ef456dff3670df227c10d5cdec473256 (patch) | |
| tree | b5237ee6a25bac06608f54d59c26f0555b1a4a2a | |
| parent | 284cf0bfb5d56dd847e48b74b6ae6c2627e164d1 (diff) | |
| download | gitlab-ce-9324a464ef456dff3670df227c10d5cdec473256.tar.gz | |
Reduce playable columns for sorting
| -rw-r--r-- | doc/api/pipelines.md | 2 | ||||
| -rw-r--r-- | lib/api/pipelines.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/api/pipelines.md b/doc/api/pipelines.md index b843d64e000..c2aca779710 100644 --- a/doc/api/pipelines.md +++ b/doc/api/pipelines.md @@ -17,7 +17,7 @@ GET /projects/:id/pipelines | `yaml_errors`| string | no | If true, returns only yaml error pipelines | | `name`| string | no | The name of user who triggered pipelines | | `username`| string | no | The username of user who triggered pipelines | -| `order_by`| string | no | Return requests ordered by `id`, `status`, `ref`, `username`, `started_at`, `finished_at`, `created_at` or `updated_at` fields. Default is `id` | +| `order_by`| string | no | Return requests ordered by `id`, `status`, `ref`, `sha`, or `user_id` fields. Default is `id` | | `sort` | string | no | Return requests sorted in `asc` or `desc` order. Default is `desc` | ``` diff --git a/lib/api/pipelines.rb b/lib/api/pipelines.rb index 79eea7e2e28..7d91900212a 100644 --- a/lib/api/pipelines.rb +++ b/lib/api/pipelines.rb @@ -22,7 +22,7 @@ module API optional :yaml_errors, type: Boolean, desc: 'If true, returns only yaml error pipelines' optional :name, type: String, desc: 'The name of user who triggered pipelines' optional :username, type: String, desc: 'The username of user who triggered pipelines' - optional :order_by, type: String, values: %w[id status ref username started_at finished_at created_at updated_at], default: 'id', + optional :order_by, type: String, values: %w[id status ref sha user_id], default: 'id', desc: 'The order_by which is combined with a sort' optional :sort, type: String, values: %w[asc desc], default: 'desc', desc: 'The sort method which is combined with an order_by' |