summaryrefslogtreecommitdiff
path: root/app/controllers/uploads_controller.rb
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2015-05-10 07:21:39 +0000
committerMarin Jankovski <marin@gitlab.com>2015-05-10 07:21:39 +0000
commit6fdc51f81d013a1e01c0742e81cdd0fa5476e2d6 (patch)
tree4af10fd6527ee3de8a115541fef9f69f5e713efd /app/controllers/uploads_controller.rb
parent40c8295a24aace3210a8bc485f853d556a8bdc5c (diff)
parenta0fd2eb568cdbe3537f10a83191fde893a5d6fcd (diff)
downloadgitlab-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 'app/controllers/uploads_controller.rb')
0 files changed, 0 insertions, 0 deletions