Commit 8ae4b861 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray 🌴

Change builds to pipelines; settings formatting

parent be18faee
...@@ -127,6 +127,8 @@ v 8.10.0 (unreleased) ...@@ -127,6 +127,8 @@ v 8.10.0 (unreleased)
- Render only commit message title in builds (Katarzyna Kobierska Ula Budziszewska) - Render only commit message title in builds (Katarzyna Kobierska Ula Budziszewska)
- Allow bulk (un)subscription from issues in issue index - Allow bulk (un)subscription from issues in issue index
- Fix MR diff encoding issues exporting GitLab projects - 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 v 8.9.6
- Fix importing of events under notes for GitLab projects. !5154 - Fix importing of events under notes for GitLab projects. !5154
......
- page_title "Pipelines Settings" - page_title "CI pipelines"
.row.prepend-top-default .row.prepend-top-default
.col-lg-3.profile-settings-sidebar .col-lg-3.profile-settings-sidebar
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
= page_title = page_title
.col-lg-9 .col-lg-9
%h5.prepend-top-0 %h5.prepend-top-0
Builds Pipelines
= form_for [@project.namespace.becomes(Namespace), @project], remote: true, authenticity_token: true do |f| = form_for [@project.namespace.becomes(Namespace), @project], remote: true, authenticity_token: true do |f|
%fieldset.builds-feature %fieldset.builds-feature
- unless @repository.gitlab_ci_yml - unless @repository.gitlab_ci_yml
.form-group .form-group
%p Builds need to be configured before you can begin using Continuous Integration. %p Pipelines 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' = link_to 'Get started with CI/CD Pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info'
.form-group .form-group
%p Get recent application code using the following command: %p Get recent application code using the following command:
.radio .radio
...@@ -64,16 +64,17 @@ ...@@ -64,16 +64,17 @@
.checkbox .checkbox
= f.label :public_builds do = f.label :public_builds do
= f.check_box :public_builds = f.check_box :public_builds
%strong Public builds %strong Public pipelines
.help-block Allow everyone to access builds for Public and Internal projects .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.label :runners_token, "Runners token", class: 'label-light'
= f.text_field :runners_token, class: "form-control", placeholder: 'xEeFCaDAB89' = f.text_field :runners_token, class: "form-control", placeholder: 'xEeFCaDAB89'
%p.help-block The secure token used to checkout project. %p.help-block The secure token used to checkout project.
= f.submit 'Save changes', class: "btn btn-save" = f.submit 'Save changes', class: "btn btn-save"
%hr
- badges_path = namespace_project_badges_path(@project.namespace, @project) - badges_path = namespace_project_badges_path(@project.namespace, @project)
.row.prepend-top-default .row.prepend-top-default
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment