diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-05 15:23:44 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-01-16 17:04:51 -0800 |
| commit | 536a47b4b70df0f2a8438ed0ada7654593fa5cd0 (patch) | |
| tree | 709e6cb2c25b4e92d4ce6570f053c6083a4dceab /app/presenters/projects | |
| parent | 3fc0564ae09a9edf87a71a8c85ff9bf8ad35121d (diff) | |
| download | gitlab-ce-536a47b4b70df0f2a8438ed0ada7654593fa5cd0.tar.gz | |
Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3'
[10.3] Migrate `can_push` column from `keys` to `deploy_keys_project`
See merge request gitlab/gitlabhq!2276
(cherry picked from commit f6ca52d31bac350a23938e0aebf717c767b4710c)
1f2bd3c0 Backport to 10.3
Diffstat (limited to 'app/presenters/projects')
| -rw-r--r-- | app/presenters/projects/settings/deploy_keys_presenter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/presenters/projects/settings/deploy_keys_presenter.rb b/app/presenters/projects/settings/deploy_keys_presenter.rb index 229311eb6ee..c226586fba5 100644 --- a/app/presenters/projects/settings/deploy_keys_presenter.rb +++ b/app/presenters/projects/settings/deploy_keys_presenter.rb @@ -7,7 +7,7 @@ module Projects delegate :size, to: :available_public_keys, prefix: true def new_key - @key ||= DeployKey.new + @key ||= DeployKey.new.tap { |dk| dk.deploy_keys_projects.build } end def enabled_keys |