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
gitlabhq · Jun 3, 2015 · a2921bd · a2921bd
2 parents c26af87 + a59854b
commit a2921bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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