summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-07-14 09:26:10 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-07-19 05:30:12 -0700
commit8ae4b8619bdf3f8d966416624464d5f6408d1cd6 (patch)
treec2716d0cc1574a403389ff9ac8ed7123fd75267a /app/views
parentbe18faee02a79094c0cfab0fdd3a2a248f140010 (diff)
downloadgitlab-ce-8ae4b8619bdf3f8d966416624464d5f6408d1cd6.tar.gz
Change builds to pipelines; settings formatting
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/builds/settings.html.haml15
1 files changed, 8 insertions, 7 deletions
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