summaryrefslogtreecommitdiff
path: root/app/views/projects/edit.html.haml
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-11-19 15:46:04 +0100
committerDouwe Maan <douwe@gitlab.com>2015-11-19 15:46:04 +0100
commitf5a630111fb1499a1541e77040529f74ca6475ec (patch)
treec3c82cd23d7bdcbfe4ec38d12be4572a6e8653ee /app/views/projects/edit.html.haml
parent28af56dea5a88ffcaceb082cf67c9c1ab021609d (diff)
parentc8074b6b115c95c68d5f7df300a391b4eab521d5 (diff)
downloadgitlab-ce-f5a630111fb1499a1541e77040529f74ca6475ec.tar.gz
Merge branch 'master' into reference-pipeline-and-caching
Diffstat (limited to 'app/views/projects/edit.html.haml')
-rw-r--r--app/views/projects/edit.html.haml11
1 files changed, 10 insertions, 1 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index f5bb00b0612..ebb9c086603 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -57,7 +57,16 @@
= f.check_box :merge_requests_enabled
%strong Merge Requests
%br
- %span.descr Submit changes to be merged upstream.
+ %span.descr Submit changes to be merged upstream
+
+ .form-group
+ .col-sm-offset-2.col-sm-10
+ .checkbox
+ = f.label :builds_enabled do
+ = f.check_box :builds_enabled
+ %strong Builds
+ %br
+ %span.descr Test and deploy your changes before merge
.form-group
.col-sm-offset-2.col-sm-10