diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-05-10 07:21:39 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-05-10 07:21:39 +0000 |
| commit | 6fdc51f81d013a1e01c0742e81cdd0fa5476e2d6 (patch) | |
| tree | 4af10fd6527ee3de8a115541fef9f69f5e713efd /features/project | |
| parent | 40c8295a24aace3210a8bc485f853d556a8bdc5c (diff) | |
| parent | a0fd2eb568cdbe3537f10a83191fde893a5d6fcd (diff) | |
| download | gitlab-ce-6fdc51f81d013a1e01c0742e81cdd0fa5476e2d6.tar.gz | |
Merge branch 'bug/fix-duplicate-deploy-keys' into 'master'
Don't show duplicate deploy keys
This fixes the issue described in [#1516](https://gitlab.com/gitlab-org/gitlab-ce/issues/1516) where you would see the same deploy key multiple times if it was used by multiple projects.
See merge request !629
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/deploy_keys.feature | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/features/project/deploy_keys.feature b/features/project/deploy_keys.feature index a71f6124d9c..47cf774094f 100644 --- a/features/project/deploy_keys.feature +++ b/features/project/deploy_keys.feature @@ -9,9 +9,10 @@ Feature: Project Deploy Keys Then I should see project deploy key Scenario: I should see project deploy keys - Given other project has deploy key + Given other projects have deploy keys When I visit project deploy keys page - Then I should see other project deploy key + Then I should see other project deploy key + And I should only see the same deploy key once Scenario: I should see public deploy keys Given public deploy key exists @@ -26,7 +27,7 @@ Feature: Project Deploy Keys And I should see newly created deploy key Scenario: I attach other project deploy key to project - Given other project has deploy key + Given other projects have deploy keys And I visit project deploy keys page When I click attach deploy key Then I should be on deploy keys page |