Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-04-15 16:51:41 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-04-18 16:54:52 +0300
commit6b124d42d9861a5f8c3dd5add7cabc864fa3673c (patch)
tree12361ba8b27fc9e0ed2a9a9862980fdc05bd9e8d /app/views/projects/runners
parent5ae4fd2181e81f6e75a9d4021fc7d0c4749139ef (diff)
Add configurable shared runners text
Diffstat (limited to 'app/views/projects/runners')
-rw-r--r--app/views/projects/runners/_shared_runners.html.haml7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/views/projects/runners/_shared_runners.html.haml b/app/views/projects/runners/_shared_runners.html.haml
index 6a37f444bb7..ec47ed79e55 100644
--- a/app/views/projects/runners/_shared_runners.html.haml
+++ b/app/views/projects/runners/_shared_runners.html.haml
@@ -1,7 +1,10 @@
%h3 Shared runners
-.bs-callout.bs-callout-warning
- GitLab Runners do not offer secure isolation between projects that they do builds for. You are TRUSTING all GitLab users who can push code to project A, B or C to run shell scripts on the machine hosting runner X.
+.bs-callout.bs-callout-warning.shared-runners-description
+ - if shared_runners_text.present?
+ = markdown(shared_runners_text)
+ - else
+ GitLab Runners do not offer secure isolation between projects that they do builds for. You are TRUSTING all GitLab users who can push code to project A, B or C to run shell scripts on the machine hosting runner X.
%hr
- if @project.shared_runners_enabled?
= link_to toggle_shared_runners_namespace_project_runners_path(@project.namespace, @project), class: 'btn btn-warning', method: :post do