summaryrefslogtreecommitdiff
path: root/app/views/admin/application_settings
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-04-15 15:51:41 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-04-18 09:54:52 -0400
commit6b124d42d9861a5f8c3dd5add7cabc864fa3673c (patch)
tree12361ba8b27fc9e0ed2a9a9862980fdc05bd9e8d /app/views/admin/application_settings
parent5ae4fd2181e81f6e75a9d4021fc7d0c4749139ef (diff)
downloadgitlab-ce-6b124d42d9861a5f8c3dd5add7cabc864fa3673c.tar.gz
Add configurable shared runners text
Diffstat (limited to 'app/views/admin/application_settings')
-rw-r--r--app/views/admin/application_settings/_form.html.haml6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 555aea554f0..e5bc7d4fdbe 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -153,7 +153,11 @@
= f.label :shared_runners_enabled do
= f.check_box :shared_runners_enabled
Enable shared runners for new projects
-
+ .form-group
+ = f.label :shared_runners_text, class: 'control-label col-sm-2'
+ .col-sm-10
+ = f.text_area :shared_runners_text, class: 'form-control', rows: 4
+ .help-block Markdown enabled
.form-group
= f.label :max_artifacts_size, 'Maximum artifacts size (MB)', class: 'control-label col-sm-2'
.col-sm-10