diff options
| author | Mark Lapierre <mlapierre@gmail.com> | 2018-06-12 01:58:06 +0300 |
|---|---|---|
| committer | Mark Lapierre <mlapierre@gitlab.com> | 2018-09-15 18:09:34 +0300 |
| commit | 6cf55e51292852975e8cc5df4bb54ca39e5dc727 (patch) | |
| tree | 97891f89e8d7688b927238d3a6b58ca4f2e0581e /app/views/profiles | |
| parent | 265b49135436af9b8938c4b21b13462f0cfffdcb (diff) | |
Add an SSH key and use it to clone and push
Adds 2 end-to-end tests:
1. Add and remove an SSH key
2. Add an SSH key and use it to clone and push
Includes changes to factories to allow Git actions via SSH
Diffstat (limited to 'app/views/profiles')
| -rw-r--r-- | app/views/profiles/keys/_form.html.haml | 6 | ||||
| -rw-r--r-- | app/views/profiles/keys/_key_details.html.haml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/profiles/keys/_form.html.haml b/app/views/profiles/keys/_form.html.haml index 5207921d6fe..700c22e1652 100644 --- a/app/views/profiles/keys/_form.html.haml +++ b/app/views/profiles/keys/_form.html.haml @@ -5,10 +5,10 @@ .form-group = f.label :key, class: 'label-bold' %p= _("Paste your public SSH key, which is usually contained in the file '~/.ssh/id_rsa.pub' and begins with 'ssh-rsa'. Don't use your private SSH key.") - = f.text_area :key, class: "form-control js-add-ssh-key-validation-input", rows: 8, required: true, placeholder: s_('Profiles|Typically starts with "ssh-rsa …"') + = f.text_area :key, class: "form-control js-add-ssh-key-validation-input qa-key-public-key-field", rows: 8, required: true, placeholder: s_('Profiles|Typically starts with "ssh-rsa …"') .form-group = f.label :title, class: 'label-bold' - = f.text_field :title, class: "form-control input-lg", required: true, placeholder: s_('Profiles|e.g. My MacBook key') + = f.text_field :title, class: "form-control input-lg qa-key-title-field", required: true, placeholder: s_('Profiles|e.g. My MacBook key') %p.form-text.text-muted= _('Name your individual key via a title') .js-add-ssh-key-validation-warning.hide @@ -19,4 +19,4 @@ %button.btn.btn-create.js-add-ssh-key-validation-confirm-submit= _("Yes, add it") .prepend-top-default - = f.submit s_('Profiles|Add key'), class: "btn btn-create js-add-ssh-key-validation-original-submit" + = f.submit s_('Profiles|Add key'), class: "btn btn-create js-add-ssh-key-validation-original-submit qa-add-key-button" diff --git a/app/views/profiles/keys/_key_details.html.haml b/app/views/profiles/keys/_key_details.html.haml index 2ac514d3f6f..88473c7f72d 100644 --- a/app/views/profiles/keys/_key_details.html.haml +++ b/app/views/profiles/keys/_key_details.html.haml @@ -24,4 +24,4 @@ = @key.key .col-md-12 .float-right - = link_to 'Remove', path_to_key(@key, is_admin), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key" + = link_to 'Remove', path_to_key(@key, is_admin), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key qa-delete-key-button" |