diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-03-08 12:35:35 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-03-08 12:35:35 +0300 |
| commit | b4852ab49a385f3cc900cf0f2584097b8a154ac0 (patch) | |
| tree | c21393db9740de7f98747969eb1d70150addeb9a /app/views/shared | |
| parent | 9372a6ca23e1826c1ce1b2cd3fe5ed9453c5689f (diff) | |
| parent | ebda46860b551c7c27891a685f06b54e091b9444 (diff) | |
Merge branch 'deploy-keys-ext' into 'master'
Externalize admin deploy keys strings
See merge request gitlab-org/gitlab-ce!24712
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/deploy_keys/_form.html.haml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/views/shared/deploy_keys/_form.html.haml b/app/views/shared/deploy_keys/_form.html.haml index eb7808573b9..bc0dc7f9631 100644 --- a/app/views/shared/deploy_keys/_form.html.haml +++ b/app/views/shared/deploy_keys/_form.html.haml @@ -13,9 +13,10 @@ = form.label :key, class: 'col-form-label col-sm-2' .col-sm-10 %p.light - Paste a machine public key here. Read more about how to generate it - = link_to 'here', help_page_path('ssh/README') - = form.text_area :key, class: 'form-control thin-area', rows: 5 + - link_start = "<a href='#{help_page_path('ssh/README')}' target='_blank' rel='noreferrer noopener'>".html_safe + - link_end = '</a>' + = _('Paste a machine public key here. Read more about how to generate it %{link_start}here%{link_end}').html_safe % { link_start: link_start, link_end: link_end.html_safe } + = form.text_area :key, class: 'form-control thin_area', rows: 5 - else = form.label :fingerprint, class: 'col-form-label col-sm-2' .col-sm-10 @@ -28,6 +29,6 @@ .col-sm-10 = deploy_keys_project_form.label :can_push do = deploy_keys_project_form.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.) + = _('Allow this key to push to repository as well? (Default only allows pull access.)') |