diff options
author | Pawel Chojnacki <pawel@chojnacki.ws> | 2018-01-29 19:49:23 +0100 |
---|---|---|
committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2018-01-29 19:49:23 +0100 |
commit | f87afeff18337fa6205ee65710033b33a7c5aa66 (patch) | |
tree | 8c583c5c97d882767f9fc126a7e9d6fa76160ec1 /spec/factories | |
parent | 4b1d42bbc583b0884498bd129653587acc69ab0f (diff) | |
parent | 44edd1111f9ba6dd0dacffad23b54c0c85a723c4 (diff) | |
download | gitlab-ce-f87afeff18337fa6205ee65710033b33a7c5aa66.tar.gz |
Merge remote-tracking branch 'upstream/master' into pawel/connect_to_prometheus_through_proxy-30480
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") |