From 8ae4b8619bdf3f8d966416624464d5f6408d1cd6 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Thu, 14 Jul 2016 09:26:10 -0500
Subject: [PATCH] Change builds to pipelines; settings formatting

---
 CHANGELOG                                    |  2 ++
 app/views/projects/builds/settings.html.haml | 15 ++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9f3a9cad83f..725667e0d52 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -127,6 +127,8 @@ v 8.10.0 (unreleased)
   - Render only commit message title in builds (Katarzyna Kobierska Ula Budziszewska)
   - Allow bulk (un)subscription from issues in issue index
   - Fix MR diff encoding issues exporting GitLab projects
+  - Move builds settings out of project settings and rename Pipelines
+  - Add builds badge to Pipelines settings page
 
 v 8.9.6
   - Fix importing of events under notes for GitLab projects. !5154
diff --git a/app/views/projects/builds/settings.html.haml b/app/views/projects/builds/settings.html.haml
index 5a7cabbbcef..9d267ea1ddf 100644
--- a/app/views/projects/builds/settings.html.haml
+++ b/app/views/projects/builds/settings.html.haml
@@ -1,4 +1,4 @@
-- page_title "Pipelines Settings"
+- page_title "CI pipelines"
 
 .row.prepend-top-default
   .col-lg-3.profile-settings-sidebar
@@ -6,13 +6,13 @@
       = page_title
   .col-lg-9
     %h5.prepend-top-0
-      Builds
+      Pipelines
     = form_for [@project.namespace.becomes(Namespace), @project], remote: true, authenticity_token: true do |f|
       %fieldset.builds-feature
         - unless @repository.gitlab_ci_yml
           .form-group
-            %p Builds need to be configured before you can begin using Continuous Integration.
-            = link_to 'Get started with Builds', help_page_path('ci/quick_start/README'), class: 'btn btn-info'
+            %p Pipelines need to be configured before you can begin using Continuous Integration.
+            = link_to 'Get started with CI/CD Pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info'
         .form-group
           %p Get recent application code using the following command:
           .radio
@@ -64,16 +64,17 @@
           .checkbox
             = f.label :public_builds do
               = f.check_box :public_builds
-              %strong Public builds
-            .help-block Allow everyone to access builds for Public and Internal projects
+              %strong Public pipelines
+            .help-block Allow everyone to access pipelines for Public and Internal projects
 
-        .form-group.append-bottom-0
+        .form-group.append-bottom-default
           = f.label :runners_token, "Runners token", class: 'label-light'
           = f.text_field :runners_token, class: "form-control", placeholder: 'xEeFCaDAB89'
           %p.help-block The secure token used to checkout project.
 
         = f.submit 'Save changes', class: "btn btn-save"
 
+%hr
 
 - badges_path = namespace_project_badges_path(@project.namespace, @project)
 .row.prepend-top-default
-- 
2.30.9