summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-06-03 14:34:02 +0000
committerValery Sizov <valery@gitlab.com>2015-06-03 14:34:02 +0000
commita2921bdbc8ec0fca3d27ce5e2a6d813549bf99dd (patch)
treeef42c5a6d66496b07fcc07c8bfd4dc1b85bb7dd0
parentc26af87bb4d07601b2aa8493fe03318d4eac939f (diff)
parenta59854bcb337e429f2cab020246dc6c8ac77c988 (diff)
downloadgitlab-ci-a2921bdbc8ec0fca3d27ce5e2a6d813549bf99dd.tar.gz
Merge branch 'runner_link' into 'master'
Link to the runner from the build page https://dev.gitlab.org/gitlab/gitlab-ci/issues/240 See merge request !115
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/builds/show.html.haml4
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e65720d..cfccbc2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ v7.12.0
- Remove ID column from runners list in the admin area
- Increase default timeout for builds to 60 minutes
- Using .gitlab-ci.yml file instead of jobs
+ - Link to the runner from the build page for admin user
v7.11.0
- Deploy Jobs API calls
diff --git a/app/views/builds/show.html.haml b/app/views/builds/show.html.haml
index 26925fb..158ec27 100644
--- a/app/views/builds/show.html.haml
+++ b/app/views/builds/show.html.haml
@@ -104,7 +104,9 @@
#{time_ago_in_words(@build.finished_at)} ago
%p
%span.attr-name Runner:
- - if @build.runner
+ - if @build.runner && current_user.is_admin
+ \#{link_to "##{@build.runner.id}", admin_runner_path(@build.runner.id)}
+ - elsif @build.runner
\##{@build.runner.id}
.build-widget