summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelogs/unreleased/feature-api_runners_online.yml5
-rw-r--r--doc/api/runners.md23
-rw-r--r--lib/api/entities.rb1
3 files changed, 21 insertions, 8 deletions
diff --git a/changelogs/unreleased/feature-api_runners_online.yml b/changelogs/unreleased/feature-api_runners_online.yml
index f5077507e5b..08f4dd16f28 100644
--- a/changelogs/unreleased/feature-api_runners_online.yml
+++ b/changelogs/unreleased/feature-api_runners_online.yml
@@ -1,4 +1,5 @@
---
-title: Add online attribute to runner api entity
+title: Add online and status attribute to runner api entity
merge_request: 11750
-author: Alessio Caiazza
+author:
+type: added
diff --git a/doc/api/runners.md b/doc/api/runners.md
index 50981ed96bc..7495c6cdedb 100644
--- a/doc/api/runners.md
+++ b/doc/api/runners.md
@@ -31,7 +31,8 @@ Example response:
"id": 6,
"is_shared": false,
"name": null,
- "online": true
+ "online": true,
+ "status": "online"
},
{
"active": true,
@@ -39,7 +40,8 @@ Example response:
"id": 8,
"is_shared": false,
"name": null,
- "online": false
+ "online": false,
+ "status": "offline"
}
]
```
@@ -72,7 +74,8 @@ Example response:
"id": 1,
"is_shared": true,
"name": null,
- "online": true
+ "online": true,
+ "status": "online"
},
{
"active": true,
@@ -81,6 +84,7 @@ Example response:
"is_shared": true,
"name": null,
"online": false
+ "status": "offline"
},
{
"active": true,
@@ -89,6 +93,7 @@ Example response:
"is_shared": false,
"name": null,
"online": true
+ "status": "paused"
},
{
"active": true,
@@ -96,7 +101,8 @@ Example response:
"id": 8,
"is_shared": false,
"name": null,
- "online": false
+ "online": false,
+ "status": "offline"
}
]
```
@@ -129,6 +135,7 @@ Example response:
"contacted_at": "2016-01-25T16:39:48.066Z",
"name": null,
"online": true,
+ "status": "online",
"platform": null,
"projects": [
{
@@ -184,6 +191,7 @@ Example response:
"contacted_at": "2016-01-25T16:39:48.066Z",
"name": null,
"online": true,
+ "status": "online",
"platform": null,
"projects": [
{
@@ -336,7 +344,8 @@ Example response:
"id": 8,
"is_shared": false,
"name": null,
- "online": false
+ "online": false,
+ "status": "offline"
},
{
"active": true,
@@ -345,6 +354,7 @@ Example response:
"is_shared": true,
"name": null,
"online": true
+ "status": "paused"
}
]
```
@@ -375,7 +385,8 @@ Example response:
"id": 9,
"is_shared": false,
"name": null,
- "online": true
+ "online": true,
+ "status": "online"
}
```
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index c612dde7f73..f5fa5fef389 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -863,6 +863,7 @@ module API
expose :is_shared
expose :name
expose :online?, as: :online
+ expose :status
end
class RunnerDetails < Runner