diff options
-rw-r--r-- | app/views/admin/hooks/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/deploy_keys/_form.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/deploy_keys/index.html.haml | 12 | ||||
-rw-r--r-- | app/views/projects/edit.html.haml | 14 | ||||
-rw-r--r-- | app/views/projects/hooks/index.html.haml | 15 | ||||
-rw-r--r-- | app/views/projects/services/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/team_members/import.html.haml | 2 |
7 files changed, 25 insertions, 24 deletions
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml index 8f302dce5d4..eb6570af30e 100644 --- a/app/views/admin/hooks/index.html.haml +++ b/app/views/admin/hooks/index.html.haml @@ -1,6 +1,6 @@ .alert.alert-info %span - Post receive hooks for binding events. + Post-receive hooks for binding events. %br Read more about system hooks %strong #{link_to "here", help_system_hooks_path, class: "vlink"} diff --git a/app/views/projects/deploy_keys/_form.html.haml b/app/views/projects/deploy_keys/_form.html.haml index 00b41e657b6..d49b2204537 100644 --- a/app/views/projects/deploy_keys/_form.html.haml +++ b/app/views/projects/deploy_keys/_form.html.haml @@ -13,7 +13,7 @@ = f.label :key .controls %p.light - Paste a machine public key here. Read more about how generate it + Paste a machine public key here. Read more about how to generate it = link_to "here", help_ssh_path = f.text_area :key, class: "input-xxlarge thin_area" diff --git a/app/views/projects/deploy_keys/index.html.haml b/app/views/projects/deploy_keys/index.html.haml index 3e797691241..53d6e36c62c 100644 --- a/app/views/projects/deploy_keys/index.html.haml +++ b/app/views/projects/deploy_keys/index.html.haml @@ -1,13 +1,13 @@ %h3.page-title - Deploy keys allow read-only access to repository + Deploy keys allow read-only access to the repository = link_to new_project_deploy_key_path(@project), class: "btn btn-new pull-right", title: "New Deploy Key" do %i.icon-plus New Deploy Key %p.light - They can be used for CI, staging or production servers. - You can create a deploy key or add existing one + Deploy keys can be used for CI, staging or production servers. + You can create a deploy key or add an existing one %hr.clearfix @@ -20,13 +20,13 @@ = render @enabled_keys - if @enabled_keys.blank? .light-well - %p.nothing_here_message Create #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add existing one + %p.nothing_here_message Create a #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add an existing one .span5.available-keys %h5 %strong Deploy keys - from projects available for you + from projects available to you %ul.bordered-list = render @available_keys - if @available_keys.blank? .light-well - %p.nothing_here_message All deploy keys created in projects you participate will be displayed here + %p.nothing_here_message Deploy keys from projects you have access to will be displayed here diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 75226afc177..117ee13140e 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -4,7 +4,7 @@ %div %h3.page-title Project settings: - %p.light Some settings like transferring project are hidden inside danger area below + %p.light Some settings, such as "Transfer Project", are hidden inside the danger area below %hr .form-holder = form_for(@project, remote: true) do |f| @@ -126,13 +126,13 @@ .control-group = f.select :namespace_id, namespaces_options(@project.namespace_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'} %ul - %li Be careful. Changing project namespace can have unintended side effects - %li You can transfer project only to namespaces you can manage + %li Be careful. Changing the project's namespace can have unintended side effects. + %li You can only transfer the project to namespaces you manage. %li You will need to update your local repositories to point to the new location. .form-actions = f.submit 'Transfer', class: "btn btn-remove" - else - %p.nothing_here_message Only project owner can transfer a project + %p.nothing_here_message Only the project owner can transfer a project .ui-box.ui-box-danger .title Rename repository @@ -146,7 +146,7 @@ .control-group = f.text_field :path %ul - %li Be careful. Rename of project repo can have unintended side effects + %li Be careful. Renaming a project's repository can have unintended side effects. %li You will need to update your local repositories to point to the new location. .form-actions = f.submit 'Rename', class: "btn btn-remove" @@ -156,9 +156,9 @@ .title Remove project .ui-box-body %p - Remove of project will cause removing repository and all related resources like issues, merge requests etc. + Removing the project will delete its repository and all related resources including issues, merge requests etc. %br - %strong Removed project can not be restored! + %strong Removed projects cannot be restored! = link_to 'Remove project', @project, confirm: remove_project_message(@project), method: :delete, class: "btn btn-remove" - else diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml index 53e54103617..f748eb29294 100644 --- a/app/views/projects/hooks/index.html.haml +++ b/app/views/projects/hooks/index.html.haml @@ -1,10 +1,11 @@ -- if can? current_user, :admin_project, @project - .alert.alert-info - %span - Post receive hooks for binding events when someone push to repository. - %br - Read more about web hooks - %strong #{link_to "here", help_web_hooks_path, class: "vlink"} +%h3.page-title + Post-receive hooks + +%p.light + #{link_to "Post-receive hooks ", help_web_hooks_path, class: "vlink"} can be + used for binding events when someone pushes to the repository. + +%hr.clearfix = form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f| -if @hook.errors.any? diff --git a/app/views/projects/services/index.html.haml b/app/views/projects/services/index.html.haml index ea73d2f85de..82b85a18acd 100644 --- a/app/views/projects/services/index.html.haml +++ b/app/views/projects/services/index.html.haml @@ -1,5 +1,5 @@ %h3.page-title Services -%p.light Service allows you to integrate GitLab with other applications +%p.light Services allow you to integrate GitLab with other applications %hr %ul.bordered-list diff --git a/app/views/projects/team_members/import.html.haml b/app/views/projects/team_members/import.html.haml index 36ebe27805b..1d98b986210 100644 --- a/app/views/projects/team_members/import.html.haml +++ b/app/views/projects/team_members/import.html.haml @@ -1,7 +1,7 @@ %h3.page-title = "Import members from another project" %p.light - Only project members will be improted. Group members will be skipped. + Only project members will be imported. Group members will be skipped. %hr = form_tag apply_import_project_team_members_path(@project), method: 'post' do .padded |