Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into update-template-name-via-sentence-case

# Conflicts:
#	.gitlab/issue_templates/Feature proposal.md

1 files changed, 13 insertions, 16 deletions

diff --git a/app/views/admin/application_settings/_terms.html.haml b/app/views/admin/application_settings/_terms.html.haml
index 257565ce193..d3dc8659d1b 100644
--- a/app/views/admin/application_settings/_terms.html.haml
+++ b/app/views/admin/application_settings/_terms.html.haml
@@ -1,22 +1,19 @@
-= form_for @application_setting, url: admin_application_settings_path do |f|
+= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group.row
-      .col-sm-12
-        .form-check
-          = f.check_box :enforce_terms, class: 'form-check-input'
-          = f.label :enforce_terms, class: 'form-check-label' do
-            = _("Require all users to accept Terms of Service when they access GitLab.")
-          .form-text.text-muted
-            = _("When enabled, users cannot use GitLab until the terms have been accepted.")
-    .form-group.row
-      .col-sm-12
-        = f.label :terms do
-          = _("Terms of Service Agreement")
-      .col-sm-12
-        = f.text_area :terms, class: 'form-control', rows: 8
+    .form-group
+      .form-check
+        = f.check_box :enforce_terms, class: 'form-check-input'
+        = f.label :enforce_terms, class: 'form-check-label' do
+          = _("Require all users to accept Terms of Service and Privacy Policy when they access GitLab.")
         .form-text.text-muted
-          = _("Markdown enabled")
+          = _("When enabled, users cannot use GitLab until the terms have been accepted.")
+    .form-group
+      = f.label :terms do
+        = _("Terms of Service Agreement and Privacy Policy")
+      = f.text_area :terms, class: 'form-control', rows: 8
+      .form-text.text-muted
+        = _("Markdown enabled")
 
   = f.submit _("Save changes"), class: "btn btn-success"