Commit 602e2e68d956a53cf411124e0548d7a93139768f
1 parent
0b432493
Exists in
master
and in
4 other branches
Lots of wording improvements for the project settings area
Summary: - Mostly very small things involving use of "a", "the" etc. - "post-receive" hooks are usually written with the hyphen in the name . - I changed the Web Hooks page to have a title consistent with all the other pages in the settings area. - More consistent usage of full-stops in lists.
Showing
7 changed files
with
25 additions
and
24 deletions
Show diff stats
app/views/admin/hooks/index.html.haml
| 1 | .alert.alert-info | 1 | .alert.alert-info |
| 2 | %span | 2 | %span |
| 3 | - Post receive hooks for binding events. | 3 | + Post-receive hooks for binding events. |
| 4 | %br | 4 | %br |
| 5 | Read more about system hooks | 5 | Read more about system hooks |
| 6 | %strong #{link_to "here", help_system_hooks_path, class: "vlink"} | 6 | %strong #{link_to "here", help_system_hooks_path, class: "vlink"} |
app/views/projects/deploy_keys/_form.html.haml
| @@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
| 13 | = f.label :key | 13 | = f.label :key |
| 14 | .controls | 14 | .controls |
| 15 | %p.light | 15 | %p.light |
| 16 | - Paste a machine public key here. Read more about how generate it | 16 | + Paste a machine public key here. Read more about how to generate it |
| 17 | = link_to "here", help_ssh_path | 17 | = link_to "here", help_ssh_path |
| 18 | = f.text_area :key, class: "input-xxlarge thin_area" | 18 | = f.text_area :key, class: "input-xxlarge thin_area" |
| 19 | 19 |
app/views/projects/deploy_keys/index.html.haml
| 1 | %h3.page-title | 1 | %h3.page-title |
| 2 | - Deploy keys allow read-only access to repository | 2 | + Deploy keys allow read-only access to the repository |
| 3 | 3 | ||
| 4 | = link_to new_project_deploy_key_path(@project), class: "btn btn-new pull-right", title: "New Deploy Key" do | 4 | = link_to new_project_deploy_key_path(@project), class: "btn btn-new pull-right", title: "New Deploy Key" do |
| 5 | %i.icon-plus | 5 | %i.icon-plus |
| 6 | New Deploy Key | 6 | New Deploy Key |
| 7 | 7 | ||
| 8 | %p.light | 8 | %p.light |
| 9 | - They can be used for CI, staging or production servers. | ||
| 10 | - You can create a deploy key or add existing one | 9 | + Deploy keys can be used for CI, staging or production servers. |
| 10 | + You can create a deploy key or add an existing one | ||
| 11 | 11 | ||
| 12 | %hr.clearfix | 12 | %hr.clearfix |
| 13 | 13 | ||
| @@ -20,13 +20,13 @@ | @@ -20,13 +20,13 @@ | ||
| 20 | = render @enabled_keys | 20 | = render @enabled_keys |
| 21 | - if @enabled_keys.blank? | 21 | - if @enabled_keys.blank? |
| 22 | .light-well | 22 | .light-well |
| 23 | - %p.nothing_here_message Create #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add existing one | 23 | + %p.nothing_here_message Create a #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add an existing one |
| 24 | .span5.available-keys | 24 | .span5.available-keys |
| 25 | %h5 | 25 | %h5 |
| 26 | %strong Deploy keys | 26 | %strong Deploy keys |
| 27 | - from projects available for you | 27 | + from projects available to you |
| 28 | %ul.bordered-list | 28 | %ul.bordered-list |
| 29 | = render @available_keys | 29 | = render @available_keys |
| 30 | - if @available_keys.blank? | 30 | - if @available_keys.blank? |
| 31 | .light-well | 31 | .light-well |
| 32 | - %p.nothing_here_message All deploy keys created in projects you participate will be displayed here | 32 | + %p.nothing_here_message Deploy keys from projects you have access to will be displayed here |
app/views/projects/edit.html.haml
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | %div | 4 | %div |
| 5 | %h3.page-title | 5 | %h3.page-title |
| 6 | Project settings: | 6 | Project settings: |
| 7 | - %p.light Some settings like transferring project are hidden inside danger area below | 7 | + %p.light Some settings, such as "Transfer Project", are hidden inside the danger area below |
| 8 | %hr | 8 | %hr |
| 9 | .form-holder | 9 | .form-holder |
| 10 | = form_for(@project, remote: true) do |f| | 10 | = form_for(@project, remote: true) do |f| |
| @@ -126,13 +126,13 @@ | @@ -126,13 +126,13 @@ | ||
| 126 | .control-group | 126 | .control-group |
| 127 | = f.select :namespace_id, namespaces_options(@project.namespace_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'} | 127 | = f.select :namespace_id, namespaces_options(@project.namespace_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'} |
| 128 | %ul | 128 | %ul |
| 129 | - %li Be careful. Changing project namespace can have unintended side effects | ||
| 130 | - %li You can transfer project only to namespaces you can manage | 129 | + %li Be careful. Changing the project's namespace can have unintended side effects. |
| 130 | + %li You can only transfer the project to namespaces you manage. | ||
| 131 | %li You will need to update your local repositories to point to the new location. | 131 | %li You will need to update your local repositories to point to the new location. |
| 132 | .form-actions | 132 | .form-actions |
| 133 | = f.submit 'Transfer', class: "btn btn-remove" | 133 | = f.submit 'Transfer', class: "btn btn-remove" |
| 134 | - else | 134 | - else |
| 135 | - %p.nothing_here_message Only project owner can transfer a project | 135 | + %p.nothing_here_message Only the project owner can transfer a project |
| 136 | 136 | ||
| 137 | .ui-box.ui-box-danger | 137 | .ui-box.ui-box-danger |
| 138 | .title Rename repository | 138 | .title Rename repository |
| @@ -146,7 +146,7 @@ | @@ -146,7 +146,7 @@ | ||
| 146 | .control-group | 146 | .control-group |
| 147 | = f.text_field :path | 147 | = f.text_field :path |
| 148 | %ul | 148 | %ul |
| 149 | - %li Be careful. Rename of project repo can have unintended side effects | 149 | + %li Be careful. Renaming a project's repository can have unintended side effects. |
| 150 | %li You will need to update your local repositories to point to the new location. | 150 | %li You will need to update your local repositories to point to the new location. |
| 151 | .form-actions | 151 | .form-actions |
| 152 | = f.submit 'Rename', class: "btn btn-remove" | 152 | = f.submit 'Rename', class: "btn btn-remove" |
| @@ -156,9 +156,9 @@ | @@ -156,9 +156,9 @@ | ||
| 156 | .title Remove project | 156 | .title Remove project |
| 157 | .ui-box-body | 157 | .ui-box-body |
| 158 | %p | 158 | %p |
| 159 | - Remove of project will cause removing repository and all related resources like issues, merge requests etc. | 159 | + Removing the project will delete its repository and all related resources including issues, merge requests etc. |
| 160 | %br | 160 | %br |
| 161 | - %strong Removed project can not be restored! | 161 | + %strong Removed projects cannot be restored! |
| 162 | 162 | ||
| 163 | = link_to 'Remove project', @project, confirm: remove_project_message(@project), method: :delete, class: "btn btn-remove" | 163 | = link_to 'Remove project', @project, confirm: remove_project_message(@project), method: :delete, class: "btn btn-remove" |
| 164 | - else | 164 | - else |
app/views/projects/hooks/index.html.haml
| 1 | -- if can? current_user, :admin_project, @project | ||
| 2 | - .alert.alert-info | ||
| 3 | - %span | ||
| 4 | - Post receive hooks for binding events when someone push to repository. | ||
| 5 | - %br | ||
| 6 | - Read more about web hooks | ||
| 7 | - %strong #{link_to "here", help_web_hooks_path, class: "vlink"} | 1 | +%h3.page-title |
| 2 | + Post-receive hooks | ||
| 3 | + | ||
| 4 | +%p.light | ||
| 5 | + #{link_to "Post-receive hooks ", help_web_hooks_path, class: "vlink"} can be | ||
| 6 | + used for binding events when someone pushes to the repository. | ||
| 7 | + | ||
| 8 | +%hr.clearfix | ||
| 8 | 9 | ||
| 9 | = form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f| | 10 | = form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f| |
| 10 | -if @hook.errors.any? | 11 | -if @hook.errors.any? |
app/views/projects/services/index.html.haml
app/views/projects/team_members/import.html.haml
| 1 | %h3.page-title | 1 | %h3.page-title |
| 2 | = "Import members from another project" | 2 | = "Import members from another project" |
| 3 | %p.light | 3 | %p.light |
| 4 | - Only project members will be improted. Group members will be skipped. | 4 | + Only project members will be imported. Group members will be skipped. |
| 5 | %hr | 5 | %hr |
| 6 | = form_tag apply_import_project_team_members_path(@project), method: 'post' do | 6 | = form_tag apply_import_project_team_members_path(@project), method: 'post' do |
| 7 | .padded | 7 | .padded |