diff options
author | Rémy Coutable <remy@rymai.me> | 2017-02-27 15:29:00 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-02-27 15:29:00 +0000 |
commit | a20ce16ad8cc2436fae91d5739ebdcd55e7f7b10 (patch) | |
tree | 43008fef1cf7f614c5990e2dc6e583a8d65569b6 | |
parent | 1229ce06bd49dcd98b2df4d3358034021b74e0d3 (diff) | |
parent | 99f5ed0e174a53e90438e3f85c980fadf31fbfa3 (diff) | |
download | gitlab-ce-a20ce16ad8cc2436fae91d5739ebdcd55e7f7b10.tar.gz |
Merge branch '14748-runner-version-in-admin-views' into 'master'
Add runner version to /admin/runners view
See merge request !8733
-rw-r--r-- | app/views/admin/runners/_runner.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/runners/index.html.haml | 1 | ||||
-rw-r--r-- | changelogs/unreleased/14748-runner-version-in-admin-views.yml | 4 |
3 files changed, 7 insertions, 0 deletions
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml index deb62845e1c..d4d166ab7b6 100644 --- a/app/views/admin/runners/_runner.html.haml +++ b/app/views/admin/runners/_runner.html.haml @@ -15,6 +15,8 @@ %td = runner.description %td + = runner.version + %td - if runner.shared? n/a - else diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml index d725e477044..7d26864d0f3 100644 --- a/app/views/admin/runners/index.html.haml +++ b/app/views/admin/runners/index.html.haml @@ -67,6 +67,7 @@ %th Type %th Runner token %th Description + %th Version %th Projects %th Jobs %th Tags diff --git a/changelogs/unreleased/14748-runner-version-in-admin-views.yml b/changelogs/unreleased/14748-runner-version-in-admin-views.yml new file mode 100644 index 00000000000..2478a81c824 --- /dev/null +++ b/changelogs/unreleased/14748-runner-version-in-admin-views.yml @@ -0,0 +1,4 @@ +--- +title: Add runner version to /admin/runners view +merge_request: 8733 +author: Jonathon Reinhart |