From f97965395198ef1da892dde246edb1e6ef480127 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Sat, 10 Dec 2016 02:25:31 +0800 Subject: Use consistent words, feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_19581826 --- app/views/admin/deploy_keys/index.html.haml | 2 +- app/views/admin/deploy_keys/new.html.haml | 2 +- app/views/projects/deploy_keys/_deploy_key.html.haml | 4 ++-- app/views/projects/deploy_keys/_form.html.haml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/admin/deploy_keys/index.html.haml b/app/views/admin/deploy_keys/index.html.haml index dee611ae014..0ba8e087e08 100644 --- a/app/views/admin/deploy_keys/index.html.haml +++ b/app/views/admin/deploy_keys/index.html.haml @@ -11,7 +11,7 @@ %tr %th Title %th Fingerprint - %th Write access + %th Write access allowed %th Added at %th %tbody diff --git a/app/views/admin/deploy_keys/new.html.haml b/app/views/admin/deploy_keys/new.html.haml index 96055174ad0..a064efc231f 100644 --- a/app/views/admin/deploy_keys/new.html.haml +++ b/app/views/admin/deploy_keys/new.html.haml @@ -21,7 +21,7 @@ .col-sm-10 = f.label :can_push do = f.check_box :can_push - %strong Write access allowed? + %strong Write access allowed %p.light.append-bottom-0 Allow this key to push to repository as well? (Default only allows pull access.) diff --git a/app/views/projects/deploy_keys/_deploy_key.html.haml b/app/views/projects/deploy_keys/_deploy_key.html.haml index d360f1bab28..d1e3cb14022 100644 --- a/app/views/projects/deploy_keys/_deploy_key.html.haml +++ b/app/views/projects/deploy_keys/_deploy_key.html.haml @@ -7,8 +7,8 @@ .description = deploy_key.fingerprint - if deploy_key.can_push? - .can-write - Can write + .write-access-allowed + Write access allowed .deploy-key-content.prepend-left-default.deploy-key-projects - deploy_key.projects.each do |project| - if can?(current_user, :read_project, project) diff --git a/app/views/projects/deploy_keys/_form.html.haml b/app/views/projects/deploy_keys/_form.html.haml index 757260aa5b5..c91bb9c255a 100644 --- a/app/views/projects/deploy_keys/_form.html.haml +++ b/app/views/projects/deploy_keys/_form.html.haml @@ -14,7 +14,7 @@ .checkbox = f.label :can_push do = f.check_box :can_push - %strong Write access allowed? + %strong Write access allowed .form-group %p.light.append-bottom-0 Allow this key to push to repository as well? (Default only allows pull access.) -- cgit v1.2.1