diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 7427cea7e8b66bc9fa69ca4f6c677c159e9174cc..47831fa002506e0cf4dee1eec734f0fe4c0410fb 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -1,7 +1,7 @@ %h3.page-title Admin area %p.light - You can manage projects, users and other GitLab data from here. + Manage projects, users and other GitLab data. %hr .admin-dashboard .row diff --git a/app/views/groups/members.html.haml b/app/views/groups/members.html.haml index 19819c96124f027c2fab4cb0bf2e6ec1957a0535..4c4b365d1a2f670929d79966739c121d50e9b76b 100644 --- a/app/views/groups/members.html.haml +++ b/app/views/groups/members.html.haml @@ -3,9 +3,7 @@ Group members - if show_roles %p.light - Members of group have access to all group projects. - Read more about permissions - %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink" + Manage group members and #{link_to "permissions", help_page_path("permissions", "permissions"), class: "vlink"}. Members of group have access to all group projects. %hr diff --git a/app/views/projects/deploy_keys/index.html.haml b/app/views/projects/deploy_keys/index.html.haml index f50aeba337a4715079c3e6ec93d7afbebd7574a9..7d47eebd3c8d78f50ecc0f267491fb94a067160a 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 the repository + Deploy keys = 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 - Deploy keys can be used for CI, staging or production servers. - You can create a deploy key or add an existing one + #{link_to "Deploy keys", help_page_path("ssh", "deploy_keys"), class: "vlink"} allow read-only access that can be used for CI, staging or production servers. + You can create a deploy key or add an existing one. %hr.clearfix @@ -29,4 +29,4 @@ = render @available_keys - if @available_keys.blank? .light-well - .nothing-here-block Deploy keys from projects you have access to will be displayed here + .nothing-here-block You don't have access to any deploy keys from other projects diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index d9acb685517cbe95cb01b8f50d38938e0066f3c3..0f07dba76c8c3d9e0be9709b3b1abcd1b650e3e5 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -3,7 +3,7 @@ .project-edit-content %div %h3.page-title - Project settings: + Project settings %p.light Some settings, such as "Transfer Project", are hidden inside the danger area below. %hr .panel-body diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml index 9a003c87f6812ae689fa35a0876556ed52472786..8b2dd9722572b7aa6c1dd8a28df392ed771ae573 100644 --- a/app/views/projects/hooks/index.html.haml +++ b/app/views/projects/hooks/index.html.haml @@ -2,7 +2,7 @@ Web hooks %p.light - #{link_to "Web hooks ", help_page_path("web_hooks", "web_hooks"), class: "vlink"} can be + #{link_to "Web hooks", help_page_path("web_hooks", "web_hooks"), class: "vlink"} can be used for binding events when something is happening within the project. %hr.clearfix @@ -25,28 +25,28 @@ = f.label :push_events, class: 'list-label' do %strong Push events %p.light - This url will be triggered by a push to the repository + This URL will be triggered by a push to the repository %div = f.check_box :tag_push_events, class: 'pull-left' .prepend-left-20 = f.label :tag_push_events, class: 'list-label' do %strong Tag push events %p.light - This url will be triggered when a new tag is pushed to the repository + This URL will be triggered when a new tag is pushed to the repository %div = f.check_box :issues_events, class: 'pull-left' .prepend-left-20 = f.label :issues_events, class: 'list-label' do %strong Issues events %p.light - This url will be triggered when an issue is created + This URL will be triggered when an issue is created %div = f.check_box :merge_requests_events, class: 'pull-left' .prepend-left-20 = f.label :merge_requests_events, class: 'list-label' do %strong Merge Request events %p.light - This url will be triggered when a merge request is created + This URL will be triggered when a merge request is created .form-actions = f.submit "Add Web Hook", class: "btn btn-create" diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml index 7925e80030506ab16fd805cbf4aaab12e9c35ac1..626830719cf45488292c5078b17e0e3b25b671ad 100644 --- a/app/views/projects/protected_branches/index.html.haml +++ b/app/views/projects/protected_branches/index.html.haml @@ -1,14 +1,13 @@ %h3.page-title Protected branches -%p.light This ability allows to keep stable branches secured and force code review before merge to protected branches +%p.light Protected branches allow project to keep stable branches secured and force code reviews before merging. %hr .bs-callout.bs-callout-info - %p Protected branches designed to + %p Protected branches %ul %li prevent push for all except #{link_to "masters", help_page_path("permissions", "permissions"), class: "vlink"} %li prevent branch from force push %li prevent branch from removal - %p Read more about project permissions #{link_to "here", help_page_path("permissions", "permissions"), class: "underlined-link"} - if can? current_user, :admin_project, @project = form_for [@project, @protected_branch], html: { class: 'form-horizontal' } do |f| diff --git a/app/views/projects/services/index.html.haml b/app/views/projects/services/index.html.haml index 7271dd830ca76f2e9b73cce73dbd10ff5170c31c..935892df31c7eef0765cae3e11bca6055aa29fc3 100644 --- a/app/views/projects/services/index.html.haml +++ b/app/views/projects/services/index.html.haml @@ -1,5 +1,5 @@ %h3.page-title Project services -%p.light Project services allow you to integrate GitLab with other applications +%p.light #{link_to "Project services", help_page_path("integration", "README"), class: "vlink"} allow you to integrate GitLab with other applications. %hr %ul.bordered-list diff --git a/app/views/projects/snippets/index.html.haml b/app/views/projects/snippets/index.html.haml index e60f9a44322d2ade2e2f0f8d4ef0e1d60fd6c168..75fe498ef061a7adf464cb81d37757680bb44769 100644 --- a/app/views/projects/snippets/index.html.haml +++ b/app/views/projects/snippets/index.html.haml @@ -5,7 +5,7 @@ Add new snippet %p.light - Share code pastes with others out of git repository + Share code pastes with others out of git repository. %hr %ul.bordered-list diff --git a/app/views/projects/team_members/index.html.haml b/app/views/projects/team_members/index.html.haml index ddb3b9d4a9d0ef5f214a6137a7c5c2456958ce15..b4f1cb8a5c7edef69ec11435e5d92787ea8922db 100644 --- a/app/views/projects/team_members/index.html.haml +++ b/app/views/projects/team_members/index.html.haml @@ -1,5 +1,5 @@ %h3.page-title - Users with access to this project + Project members - if can? current_user, :admin_team_member, @project %span.pull-right @@ -9,8 +9,7 @@ Import members %p.light - Read more about project permissions - %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink" + Manage project members and #{link_to "permissions", help_page_path("permissions", "permissions"), class: "vlink"} = render "team", members: @users_projects - if @group = render "group_members" diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml index e3edd85698374357d17e3b04afcc449cf904e528..e782fbd4eb5e065b0bb489ce22b85716f7baeb93 100644 --- a/app/views/snippets/current_user_index.html.haml +++ b/app/views/snippets/current_user_index.html.haml @@ -1,5 +1,5 @@ %h3.page-title - My Snippets + My snippets .pull-right = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do Add new snippet diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml index cea2517a8e1cfa9b5aa6c5bc51bb946c150f0fcd..b8b3eeaf6b1b864dc8dffcbf0eddfbc817a0d9db 100644 --- a/app/views/snippets/index.html.haml +++ b/app/views/snippets/index.html.haml @@ -8,7 +8,7 @@ My snippets %p.light - Public snippets created by you and other users are listed here + Public snippets created by you and other users. %hr = render 'snippets'