summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-01-31 10:01:27 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-01-31 10:01:27 +0000
commitab8b77a87c99a5b83050e2e9d588d4940288d754 (patch)
tree2b9e9c8723246e5ba9578d61d2fb617d27f4a623
parent2cea02240be21fdddeeb30f1bcc75ced43872ab3 (diff)
parent60dd27a8a1aaf693e550af9fe0efa04afd79e60c (diff)
downloadgitlab-ce-ab8b77a87c99a5b83050e2e9d588d4940288d754.tar.gz
Merge branch 'hnk-master-patch-61932' into 'master'
Update runner admin page to make description field larger Closes #54639 See merge request gitlab-org/gitlab-ce!23593
-rw-r--r--app/views/admin/runners/_runner.html.haml4
-rw-r--r--app/views/admin/runners/index.html.haml4
-rw-r--r--changelogs/unreleased/hnk-master-patch-61932.yml5
3 files changed, 9 insertions, 4 deletions
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml
index b75454b33d7..ec57eb1ed08 100644
--- a/app/views/admin/runners/_runner.html.haml
+++ b/app/views/admin/runners/_runner.html.haml
@@ -18,12 +18,12 @@
.table-mobile-content
= link_to runner.short_sha, admin_runner_path(runner)
- .table-section.section-15
+ .table-section.section-20
.table-mobile-header{ role: 'rowheader' }= _('Description')
.table-mobile-content.str-truncated.has-tooltip{ title: runner.description }
= runner.description
- .table-section.section-15
+ .table-section.section-10
.table-mobile-header{ role: 'rowheader' }= _('Version')
.table-mobile-content.str-truncated.has-tooltip{ title: runner.version }
= runner.version
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index e9e4e0847d3..81380587fd2 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -106,8 +106,8 @@
.gl-responsive-table-row.table-row-header{ role: 'row' }
.table-section.section-10{ role: 'rowheader' }= _('Type')
.table-section.section-10{ role: 'rowheader' }= _('Runner token')
- .table-section.section-15{ role: 'rowheader' }= _('Description')
- .table-section.section-15{ role: 'rowheader' }= _('Version')
+ .table-section.section-20{ role: 'rowheader' }= _('Description')
+ .table-section.section-10{ role: 'rowheader' }= _('Version')
.table-section.section-10{ role: 'rowheader' }= _('IP Address')
.table-section.section-5{ role: 'rowheader' }= _('Projects')
.table-section.section-5{ role: 'rowheader' }= _('Jobs')
diff --git a/changelogs/unreleased/hnk-master-patch-61932.yml b/changelogs/unreleased/hnk-master-patch-61932.yml
new file mode 100644
index 00000000000..8cc9d0057a9
--- /dev/null
+++ b/changelogs/unreleased/hnk-master-patch-61932.yml
@@ -0,0 +1,5 @@
+---
+title: Update runner admin page to make description field larger
+merge_request: 23593
+author: Sascha Reynolds
+type: fixed