summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-03-14 23:52:17 +0900
committerShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-05-03 02:11:51 +0900
commitd1ca5f46d4268ca3bba7801e581395e038c97129 (patch)
treeaf6c1247bc323b9636d0b441ff1582bd008646fd
parentd74a04c499d511d6fec8d1f0ddcfc087596b9224 (diff)
downloadgitlab-ce-d1ca5f46d4268ca3bba7801e581395e038c97129.tar.gz
No need to support sha for sorting
-rw-r--r--doc/api/pipelines.md2
-rw-r--r--lib/api/pipelines.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/api/pipelines.md b/doc/api/pipelines.md
index c2aca779710..d231dfc5241 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`, `sha`, or `user_id` fields. Default is `id` |
+| `order_by`| string | no | Return requests ordered by `id`, `status`, `ref`, 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 7d91900212a..b0f586b08da 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 sha user_id], default: 'id',
+ optional :order_by, type: String, values: %w[id status ref 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'