diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-05-24 09:04:43 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-05-24 09:04:43 -0600 |
| commit | d1f99bcc1d52ebbbeab3a35c560f35edaff239c7 (patch) | |
| tree | bba5e4ac71204da0380537c375d3b80c0ad99f90 | |
| parent | 1a85f80b789ec966742fd58f21e8c347d2ac0a06 (diff) | |
| download | gitlab-ce-d1f99bcc1d52ebbbeab3a35c560f35edaff239c7.tar.gz | |
Resolve some issues Jacob brought up.
| -rw-r--r-- | app/views/profiles/preferences/show.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/triggers/index.html.haml | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 0a3bbe2a815..1b1b16d656f 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -5,7 +5,7 @@ %h4.prepend-top-0 Application theme %p - Customize the appearance of the interface. + This setting allows you to customize the appearance of the site, e.g. the sidebar. .col-lg-9.application-theme - Gitlab::Themes.each do |theme| = label_tag do @@ -18,7 +18,7 @@ %h4.prepend-top-0 Syntax highlighting theme %p - Customize the syntax highlighting. + This setting allow you to customize the appearance of the syntax. .col-lg-9.syntax-theme - Gitlab::ColorSchemes.each do |scheme| = label_tag do @@ -31,7 +31,7 @@ %h4.prepend-top-0 Behavior %p - Customize the behavior of the system layout and default views. + This setting allows you to customize the behavior of the system layout and default views. .col-lg-9 .form-group = f.label :layout, class: 'label-light' do diff --git a/app/views/projects/triggers/index.html.haml b/app/views/projects/triggers/index.html.haml index 7db0beba00b..7f3de47d7df 100644 --- a/app/views/projects/triggers/index.html.haml +++ b/app/views/projects/triggers/index.html.haml @@ -5,7 +5,7 @@ %h4.prepend-top-0 = page_title %p - Triggers can force a specific branch or tag to rebuild using an API call. + Triggers can force a specific branch or tag to rebuild with an API call. .col-lg-9 %h5.prepend-top-0 Your triggers @@ -19,7 +19,7 @@ = render partial: 'trigger', collection: @triggers, as: :trigger - else %p.settings-message.text-center.append-bottom-default - There are no triggers to use, create a trigger using the button below. + No triggers have been created yet. Add one using the button below. = form_for @trigger, url: url_for(controller: 'projects/triggers', action: 'create') do |f| = f.submit "Add Trigger", class: 'btn btn-success' @@ -28,7 +28,7 @@ Use CURL %p.light - Copy the token above and set your branch or tag name. This is the reference that will be rebuilt. + Copy the token above, set your branch or tag name, and that reference will be rebuilt. %pre :plain @@ -57,7 +57,7 @@ %p.light Add %code variables[VARIABLE]=VALUE - to API requests. Variable values can be used to distinguish triggered and normal builds. + to an API request. Variable values can be used to distinguish between triggered builds and normal builds. %pre.append-bottom-0 :plain |