diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-05 15:23:45 +0000 |
|---|---|---|
| committer | Tiago Botelho <tiago@gitlab.com> | 2018-01-08 13:33:36 +0000 |
| commit | 405fb319bb2758dbb71e798dd24611ec94700e32 (patch) | |
| tree | d1aa8e1548d0bd15ccabc619f65d93925ab071a1 /app/views/projects/deploy_keys/_form.html.haml | |
| parent | d75e458a20a7da21adfc837633745fad6aa3e090 (diff) | |
| download | gitlab-ce-405fb319bb2758dbb71e798dd24611ec94700e32.tar.gz | |
Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-2' into 'security-10-2'
[10.2] Migrate `can_push` column from `keys` to `deploy_keys_project`
See merge request gitlab/gitlabhq!2275
(cherry picked from commit b07115bbf3a6f2340e88213f51f699302e6af1d9)
5382c682 Backport to 10.2
Diffstat (limited to 'app/views/projects/deploy_keys/_form.html.haml')
| -rw-r--r-- | app/views/projects/deploy_keys/_form.html.haml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/app/views/projects/deploy_keys/_form.html.haml b/app/views/projects/deploy_keys/_form.html.haml index edaa3a1119e..944873bbfc9 100644 --- a/app/views/projects/deploy_keys/_form.html.haml +++ b/app/views/projects/deploy_keys/_form.html.haml @@ -10,13 +10,14 @@ %p.light.append-bottom-0 Paste a machine public key here. Read more about how to generate it = link_to "here", help_page_path("ssh/README") - .form-group - .checkbox - = f.label :can_push do - = f.check_box :can_push - %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.) + = f.fields_for :deploy_keys_projects do |deploy_keys_project_form| + .form-group + .checkbox + = deploy_keys_project_form.label :can_push do + = deploy_keys_project_form.check_box :can_push + %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.) = f.submit "Add key", class: "btn-create btn" |