summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/api/runners.md14
-rw-r--r--lib/api/runners.rb4
2 files changed, 10 insertions, 8 deletions
diff --git a/doc/api/runners.md b/doc/api/runners.md
index aa58c4431b8..876dd304208 100644
--- a/doc/api/runners.md
+++ b/doc/api/runners.md
@@ -167,6 +167,14 @@ Example response:
"last_contact": "2016-01-25T16:39:48.066Z",
"name": null,
"platform": null,
+ "projects": [
+ {
+ "id": 1,
+ "name": "GitLab.org / GitLab Community Edition",
+ "path": "gitlab-org/gitlab-ce"
+ }
+ ],
+ "token": "205086a8e3b9a2b818ffac9b89d102",
"revision": null,
"tag_list": [
"ruby",
@@ -199,16 +207,10 @@ Example response:
```json
{
"active": true,
- "architecture": null,
"description": "test-1-20150125-test",
"id": 6,
"is_shared": false,
- "last_contact": "2016-01-25T16:39:48.066Z",
"name": null,
- "platform": null,
- "revision": null,
- "tag_list": [],
- "version": null
}
```
diff --git a/lib/api/runners.rb b/lib/api/runners.rb
index 03803ede9fc..0c158745124 100644
--- a/lib/api/runners.rb
+++ b/lib/api/runners.rb
@@ -51,7 +51,7 @@ module API
attrs = attributes_for_keys [:description, :active, :tag_list]
if runner.update(attrs)
- present runner, with: Entities::RunnerDetails
+ present runner, with: Entities::RunnerDetails, current_user: current_user
else
render_validation_error!(runner)
end
@@ -68,7 +68,7 @@ module API
authenticate_delete_runner!(runner)
runner.destroy!
- present runner, with: Entities::RunnerDetails
+ present runner, with: Entities::Runner
end
end