Commit 238d24fc authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parents ed90090a 92b4b77a
...@@ -23,5 +23,5 @@ ...@@ -23,5 +23,5 @@
%li Group is kind of directory for several projects %li Group is kind of directory for several projects
%li All created groups are private %li All created groups are private
%li People within a group see only projects they have access to %li People within a group see only projects they have access to
%li All projects of group will be stored in group directory %li All projects of group will be stored in a group directory
%li You will be able to move existing projects into group %li You will be able to move existing projects into group
= render "projects/settings_nav" = render "projects/settings_nav"
%p.slead %p.slead
Deploy keys allow read-only access to repository. It matches perfectly for CI, staging or production servers. 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.
- if can? current_user, :admin_project, @project - if can? current_user, :admin_project, @project
= link_to new_project_deploy_key_path(@project), class: "btn btn-small", title: "New Deploy Key" do = link_to new_project_deploy_key_path(@project), class: "btn btn-small", title: "New Deploy Key" do
......
...@@ -24,5 +24,5 @@ ...@@ -24,5 +24,5 @@
%li Group is kind of directory for several projects %li Group is kind of directory for several projects
%li All created groups are private %li All created groups are private
%li People within a group see only projects they have access to %li People within a group see only projects they have access to
%li All projects of group will be stored in group directory %li All projects of group will be stored in a group directory
%li You will be able to move existing projects into group %li You will be able to move existing projects into group
...@@ -6,5 +6,5 @@ ...@@ -6,5 +6,5 @@
title: title:
%code= @key.title %code= @key.title
%p %p
If this key was added in error, you can remove here: If this key was added in error, you can remove it here:
= link_to "SSH Keys", keys_url = link_to "SSH Keys", keys_url
...@@ -4,4 +4,4 @@ A new public key was added to your account: ...@@ -4,4 +4,4 @@ A new public key was added to your account:
title.................. <%= @key.title %> title.................. <%= @key.title %>
If this key was added in error, you can remove here: <%= keys_url %> If this key was added in error, you can remove it here: <%= keys_url %>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment