diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-05 18:23:44 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-01-17 04:04:51 +0300 |
| commit | 536a47b4b70df0f2a8438ed0ada7654593fa5cd0 (patch) | |
| tree | 709e6cb2c25b4e92d4ce6570f053c6083a4dceab /spec/factories | |
| parent | 3fc0564ae09a9edf87a71a8c85ff9bf8ad35121d (diff) | |
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 'spec/factories')
| -rw-r--r-- | spec/factories/deploy_keys_projects.rb | 4 | ||||
| -rw-r--r-- | spec/factories/keys.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/factories/deploy_keys_projects.rb b/spec/factories/deploy_keys_projects.rb index 30a6d468ed3..4350652fb79 100644 --- a/spec/factories/deploy_keys_projects.rb +++ b/spec/factories/deploy_keys_projects.rb @@ -2,5 +2,9 @@ FactoryBot.define do factory :deploy_keys_project do deploy_key project + + trait :write_access do + can_push true + end end end diff --git a/spec/factories/keys.rb b/spec/factories/keys.rb index 552b4b7e06e..f0c43f3d6f5 100644 --- a/spec/factories/keys.rb +++ b/spec/factories/keys.rb @@ -15,10 +15,6 @@ FactoryBot.define do factory :another_deploy_key, class: 'DeployKey' end - factory :write_access_key, class: 'DeployKey' do - can_push true - end - factory :rsa_key_2048 do key do <<~KEY.delete("\n") |