summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-19 16:00:01 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-19 16:00:01 +0000
commit1f82dda74c6e24b6ad0a6f91312a5da72a93537c (patch)
treecca1c0b1dfb6de753b6531c8f6ddbe08f45fbd7d
parenta8884ff5d61164a37cdcb6820f688b1c3e61e51d (diff)
parenta1b8a684f165e846f2ffd61eb9b45360eaf7882f (diff)
downloadgitlab-ci-1f82dda74c6e24b6ad0a6f91312a5da72a93537c.tar.gz
Merge branch 'runners_ui_fix' into 'master'
Fix runners page UI https://dev.gitlab.org/gitlab/gitlab-ci/issues/199 Removed ID column from table ![Screenshot_2015-05-15_13.06.28](https://gitlab.com/gitlab-org/gitlab-ci/uploads/72673840008afae3b9d981d020618d33/Screenshot_2015-05-15_13.06.28.png) See merge request !103
-rw-r--r--CHANGELOG2
-rw-r--r--app/views/admin/runners/_runner.html.haml2
-rw-r--r--app/views/admin/runners/index.html.haml1
-rw-r--r--app/views/runners/_runner.html.haml2
4 files changed, 3 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ff7eda7..13bebea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
v7.12.0
- Endless scroll on the dashboard
- Add notification if there are no runners
+ - Fix pagination on dashboard
+ - Remove ID column from runners list in the admin area
v7.11.0
- Deploy Jobs API calls
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml
index 5340830..98342a8 100644
--- a/app/views/admin/runners/_runner.html.haml
+++ b/app/views/admin/runners/_runner.html.haml
@@ -1,7 +1,5 @@
%tr{id: dom_id(runner)}
%td
- = runner.id
- %td
- if runner.shared?
%span.label.label-success shared
- else
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index 0d64c8b..966de9c 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -32,7 +32,6 @@
%table.table
%thead
%tr
- %th ID
%th Type
%th Runner token
%th Description
diff --git a/app/views/runners/_runner.html.haml b/app/views/runners/_runner.html.haml
index fc78ffc..144edb3 100644
--- a/app/views/runners/_runner.html.haml
+++ b/app/views/runners/_runner.html.haml
@@ -7,7 +7,7 @@
%small
=link_to edit_project_runner_path(@project, runner) do
%i.fa.icon-edit.btn
-
+
.pull-right
- if @runners.include?(runner)
- if runner.belongs_to_one_project?