Commit 1a85f80b authored by Connor Shea's avatar Connor Shea

Fix grammar and wording in text on various pages.

parent aa060e68
%h3.page-title Authorize required %h3.page-title Authorization required
%main{:role => "main"} %main{:role => "main"}
%p.h4 %p.h4
Authorize Authorize
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
%h4.prepend-top-0 %h4.prepend-top-0
Application theme Application theme
%p %p
This setting allows you to customize the appearance of the site, ex. sidebar. Customize the appearance of the interface.
.col-lg-9.application-theme .col-lg-9.application-theme
- Gitlab::Themes.each do |theme| - Gitlab::Themes.each do |theme|
= label_tag do = label_tag do
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
%h4.prepend-top-0 %h4.prepend-top-0
Syntax highlighting theme Syntax highlighting theme
%p %p
This setting allow you to customize the appearance of the syntax. Customize the syntax highlighting.
.col-lg-9.syntax-theme .col-lg-9.syntax-theme
- Gitlab::ColorSchemes.each do |scheme| - Gitlab::ColorSchemes.each do |scheme|
= label_tag do = label_tag do
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
%h4.prepend-top-0 %h4.prepend-top-0
Behavior Behavior
%p %p
This setting allows you to customize the behavior of the system layout and default views. Customize the behavior of the system layout and default views.
.col-lg-9 .col-lg-9
.form-group .form-group
= f.label :layout, class: 'label-light' do = f.label :layout, class: 'label-light' do
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
.header.clearfix .header.clearfix
%h3#date_header.page-title %h3#date_header.page-title
%p.light %p.light
Commits to #{@ref}, excluding merge commits. Limited by 6,000 commits Commits to #{@ref}, excluding merge commits. Limited to 6,000 commits.
%input#brush_change{:type => "hidden"} %input#brush_change{:type => "hidden"}
.graphs .graphs
#contributors-master #contributors-master
......
...@@ -18,6 +18,6 @@ ...@@ -18,6 +18,6 @@
- else - else
.nothing-here-block .nothing-here-block
- if can? current_user, :admin_label, @project - if can? current_user, :admin_label, @project
Create first label or #{link_to 'generate', generate_namespace_project_labels_path(@project.namespace, @project), method: :post} default set of labels Create a label or #{link_to 'generate a default set of labels', generate_namespace_project_labels_path(@project.namespace, @project), method: :post}.
- else - else
No labels created No labels created
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
Install GitLab Runner software. Install GitLab Runner software.
Checkout the #{link_to 'GitLab Runner section', 'https://about.gitlab.com/gitlab-ci/#gitlab-runner', target: '_blank'} to install it Checkout the #{link_to 'GitLab Runner section', 'https://about.gitlab.com/gitlab-ci/#gitlab-runner', target: '_blank'} to install it
%li %li
Specify following URL during runner setup: Specify the following URL during runner setup:
%code #{ci_root_url(only_path: false)} %code #{ci_root_url(only_path: false)}
%li %li
Use the following registration token during setup: Use the following registration token during setup:
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
%h4.prepend-top-0 %h4.prepend-top-0
= page_title = page_title
%p %p
Triggers can be used to force a rebuild of a specific branch or tag with an API call. Triggers can force a specific branch or tag to rebuild using an API call.
.col-lg-9 .col-lg-9
%h5.prepend-top-0 %h5.prepend-top-0
Your triggers Your triggers
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
= render partial: 'trigger', collection: @triggers, as: :trigger = render partial: 'trigger', collection: @triggers, as: :trigger
- else - else
%p.settings-message.text-center.append-bottom-default %p.settings-message.text-center.append-bottom-default
There are no triggers to use, add one by the button below. There are no triggers to use, create a trigger using the button below.
= form_for @trigger, url: url_for(controller: 'projects/triggers', action: 'create') do |f| = form_for @trigger, url: url_for(controller: 'projects/triggers', action: 'create') do |f|
= f.submit "Add Trigger", class: 'btn btn-success' = f.submit "Add Trigger", class: 'btn btn-success'
...@@ -28,8 +28,7 @@ ...@@ -28,8 +28,7 @@
Use CURL Use CURL
%p.light %p.light
Copy the token above and set your branch or tag name. This is the reference that will be rebuild. Copy the token above and set your branch or tag name. This is the reference that will be rebuilt.
%pre %pre
:plain :plain
...@@ -41,10 +40,10 @@ ...@@ -41,10 +40,10 @@
Use .gitlab-ci.yml Use .gitlab-ci.yml
%p.light %p.light
Copy the snippet to In the
%i .gitlab-ci.yml %code .gitlab-ci.yml
of dependent project. of the dependent project, include the following snippet.
At the end of your build it will trigger this project to rebuilt. The project will rebuild at the end of the build.
%pre %pre
:plain :plain
...@@ -57,9 +56,8 @@ ...@@ -57,9 +56,8 @@
%p.light %p.light
Add Add
%strong variables[VARIABLE]=VALUE %code variables[VARIABLE]=VALUE
to API request. to API requests. Variable values can be used to distinguish triggered and normal builds.
The value of variable could then be used to distinguish triggered build from normal one.
%pre.append-bottom-0 %pre.append-bottom-0
:plain :plain
......
...@@ -24,8 +24,8 @@ class Spinach::Features::ProjectIssuesLabels < Spinach::FeatureSteps ...@@ -24,8 +24,8 @@ class Spinach::Features::ProjectIssuesLabels < Spinach::FeatureSteps
step 'I should see labels help message' do step 'I should see labels help message' do
page.within '.labels' do page.within '.labels' do
expect(page).to have_content 'Create first label or generate default set of '\ expect(page).to have_content 'Create a label or generate a default set '\
'labels' 'of labels'
end end
end end
......
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