Download as
Browse Code »

Commit 238d24fca9033633f30ad4f1e900c221a6cd19d8

Authored by Dmitriy Zaporozhets
2 parents ed90090a 92b4b77a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'improve-wording' of /home/git/repositories/gitlab/gitlabhq

Showing 5 changed files with 5 additions and 5 deletions   Show diff stats
app/views/admin/groups/new.html.haml
  Diff comments   View file @238d24f
... ... @@ -23,5 +23,5 @@
23 23 %li Group is kind of directory for several projects
24 24 %li All created groups are private
25 25 %li People within a group see only projects they have access to
26   - %li All projects of group will be stored in group directory
  26 + %li All projects of group will be stored in a group directory
27 27 %li You will be able to move existing projects into group
... ...
app/views/deploy_keys/index.html.haml
  Diff comments   View file @238d24f
1 1 = render "projects/settings_nav"
2 2  
3 3 %p.slead
4   - Deploy keys allow read-only access to repository. It matches perfectly for CI, staging or production servers.
  4 + Deploy keys allow read-only access to repository. They can be used for for CI, staging or production servers. A deploy key can be added to only one project. If you need to add the same key to multiple projects you can create a deploy user and add that user to multiple projects.
5 5  
6 6 - if can? current_user, :admin_project, @project
7 7 = link_to new_project_deploy_key_path(@project), class: "btn btn-small", title: "New Deploy Key" do
... ...
app/views/groups/new.html.haml
  Diff comments   View file @238d24f
... ... @@ -24,5 +24,5 @@
24 24 %li Group is kind of directory for several projects
25 25 %li All created groups are private
26 26 %li People within a group see only projects they have access to
27   - %li All projects of group will be stored in group directory
  27 + %li All projects of group will be stored in a group directory
28 28 %li You will be able to move existing projects into group
... ...
app/views/notify/new_ssh_key_email.html.haml
  Diff comments   View file @238d24f
... ... @@ -6,5 +6,5 @@
6 6 title:
7 7 %code= @key.title
8 8 %p
9   - If this key was added in error, you can remove here:
  9 + If this key was added in error, you can remove it here:
10 10 = link_to "SSH Keys", keys_url
... ...
app/views/notify/new_ssh_key_email.text.erb
  Diff comments   View file @238d24f
... ... @@ -4,4 +4,4 @@ A new public key was added to your account:
4 4  
5 5 title.................. <%= @key.title %>
6 6  
7   -If this key was added in error, you can remove here: <%= keys_url %>
  7 +If this key was added in error, you can remove it here: <%= keys_url %>
... ...