diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-02-20 16:08:37 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-02-20 16:08:37 +0000 |
| commit | 6df411b442d5791c67d5193b90a609cfe23aa6f5 (patch) | |
| tree | 21d064cd76aec0f301d969302e617678626ae930 | |
| parent | 5643e4d1ea8899f32e39be0f393f7be3c4b206c4 (diff) | |
| parent | 7d31cf8601be5e8344710579796e919d84c1f586 (diff) | |
| download | gitlab-ce-6df411b442d5791c67d5193b90a609cfe23aa6f5.tar.gz | |
Merge branch 'fix-grammar' into 'master'
Fix some grammar in the API docs
See merge request !9379
| -rw-r--r-- | doc/api/commits.md | 4 | ||||
| -rw-r--r-- | doc/api/deploy_keys.md | 2 | ||||
| -rw-r--r-- | lib/api/commits.rb | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/api/commits.md b/doc/api/commits.md index 3223b82f60a..eaab3e0df3d 100644 --- a/doc/api/commits.md +++ b/doc/api/commits.md @@ -12,8 +12,8 @@ GET /projects/:id/repository/commits | --------- | ---- | -------- | ----------- | | `id` | integer/string | yes | The ID of a project or NAMESPACE/PROJECT_NAME owned by the authenticated user | `ref_name` | string | no | The name of a repository branch or tag or if not given the default branch | -| `since` | string | no | Only commits after or in this date will be returned in ISO 8601 format YYYY-MM-DDTHH:MM:SSZ | -| `until` | string | no | Only commits before or in this date will be returned in ISO 8601 format YYYY-MM-DDTHH:MM:SSZ | +| `since` | string | no | Only commits after or on this date will be returned in ISO 8601 format YYYY-MM-DDTHH:MM:SSZ | +| `until` | string | no | Only commits before or on this date will be returned in ISO 8601 format YYYY-MM-DDTHH:MM:SSZ | ```bash curl --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/5/repository/commits" diff --git a/doc/api/deploy_keys.md b/doc/api/deploy_keys.md index 8d0dbfd7597..39afc4b2df5 100644 --- a/doc/api/deploy_keys.md +++ b/doc/api/deploy_keys.md @@ -137,7 +137,7 @@ Example response: ## Delete deploy key -Removes a deploy key from the project. If the deploy is used only for this project, it will be deleted from the system. +Removes a deploy key from the project. If the deploy key is used only for this project, it will be deleted from the system. ``` DELETE /projects/:id/deploy_keys/:key_id diff --git a/lib/api/commits.rb b/lib/api/commits.rb index f0ed5f34419..3b314c89c6e 100644 --- a/lib/api/commits.rb +++ b/lib/api/commits.rb @@ -16,8 +16,8 @@ module API end params do optional :ref_name, type: String, desc: 'The name of a repository branch or tag, if not given the default branch is used' - optional :since, type: DateTime, desc: 'Only commits after or in this date will be returned' - optional :until, type: DateTime, desc: 'Only commits before or in this date will be returned' + optional :since, type: DateTime, desc: 'Only commits after or on this date will be returned' + optional :until, type: DateTime, desc: 'Only commits before or on this date will be returned' optional :page, type: Integer, default: 0, desc: 'The page for pagination' optional :per_page, type: Integer, default: 20, desc: 'The number of results per page' optional :path, type: String, desc: 'The file path' |