diff options
| author | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-04-27 22:09:18 +0900 |
|---|---|---|
| committer | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-05-03 02:11:51 +0900 |
| commit | 255bfd658340e36a882108d4a9911d7f9cde638d (patch) | |
| tree | d5fa454ff65e1dddb82d0e596adeff1354e2bb5b | |
| parent | 0aebc829ad15558d5b6c1bb2212956fb193a1def (diff) | |
| download | gitlab-ce-255bfd658340e36a882108d4a9911d7f9cde638d.tar.gz | |
Improve documentation
| -rw-r--r-- | doc/api/pipelines.md | 6 | ||||
| -rw-r--r-- | lib/api/pipelines.rb | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/api/pipelines.md b/doc/api/pipelines.md index 31a28325a58..890945cfc7e 100644 --- a/doc/api/pipelines.md +++ b/doc/api/pipelines.md @@ -14,11 +14,11 @@ GET /projects/:id/pipelines | `scope` | string | no | The scope of pipelines, one of: `running`, `pending`, `finished`, `branches`, `tags` | | `status` | string | no | The status of pipelines, one of: `running`, `pending`, `success`, `failed`, `canceled`, `skipped` | | `ref` | string | no | The ref of pipelines | -| `yaml_errors`| boolean | no | Returns pipelines which have an error of gitlab-ci.yml | +| `yaml_errors`| boolean | no | Returns pipelines with invalid configurations | | `name`| string | no | The name of the user who triggered pipelines | | `username`| string | no | The username of the user who triggered pipelines | -| `order_by`| string | no | Return requests ordered by `id`, `status`, `ref`, or `user_id`. Default is `id`. Can be combined with `sort`. If you omit `sort`, its default value is used (`desc`) | -| `sort` | string | no | Return requests sorted in `asc` or `desc` order. Default is `desc`. Can be combined with `order_by`. If you omit `order_by`, its default value is used (`id`) | +| `order_by`| string | no | Order pipelines by `id`, `status`, `ref`, or `user_id` (default: `id`) | +| `sort` | string | no | Sort pipelines in `asc` or `desc` order (default: `desc`) | ``` curl --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v4/projects/1/pipelines" diff --git a/lib/api/pipelines.rb b/lib/api/pipelines.rb index 6a054544d70..9117704aa46 100644 --- a/lib/api/pipelines.rb +++ b/lib/api/pipelines.rb @@ -19,13 +19,13 @@ module API 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: '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 :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: 'The order_by which is combined with a sort' + desc: 'Order pipelines' optional :sort, type: String, values: %w[asc desc], default: 'desc', - desc: 'The sort method which is combined with an order_by' + desc: 'Sort pipelines' end get ':id/pipelines' do authorize! :read_pipeline, user_project |