summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-23 09:36:42 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-23 09:36:42 +0000
commit3825fac65ba2e36620f7d50a8e52fc242ac0d710 (patch)
tree445b7384312666461693e07a2c7194db9823fc5b
parent01b79e8c2d10cdf0560e5653934f461d876405be (diff)
parentc64c4390bf3830bd076127997808e20eabeb1cb3 (diff)
downloadgitlab-ci-3825fac65ba2e36620f7d50a8e52fc242ac0d710.tar.gz
Merge branch 'no_runner_notification' into 'master'
No runner notification can see managers only https://dev.gitlab.org/gitlab/gitlab-ci/issues/286 See merge request !158
-rw-r--r--CHANGELOG3
-rw-r--r--app/views/projects/show.html.haml2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9d1378c..f94282b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v7.13.0
+ - Fix: No runner notification can see managers only
+
v7.12.1
- Runner without tag should pick builds without tag only
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 75dc345..c5c2e3f 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -1,6 +1,6 @@
= render 'shared/guide' unless @project.setup_finished?
-- unless @project.any_runners?
+- if current_user && current_user.can_manage_project?(@project.gitlab_id) && !@project.any_runners?
.alert.alert-danger
Builds for this project wont be served unless you configure runners on
= link_to "Runners page", project_runners_path(@project)