summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-05-14 11:16:21 -0500
committerKamil Trzcinski <ayufan@ayufan.eu>2016-05-14 11:16:21 -0500
commit9496f7a71ac40e2448dfeb132a105caf66301b93 (patch)
tree95996db23acd8da77f725245813a32779db87912
parent654d5ad3f42732df77553bfbc2230f17d9185267 (diff)
parent0a9979d9ef3b5205e36ecfb66ff6322fa824492f (diff)
downloadgitlab-ce-9496f7a71ac40e2448dfeb132a105caf66301b93.tar.gz
Merge branch 'docker-registry' into docker-registry-view
-rw-r--r--spec/services/auth/container_registry_authentication_service_spec.rb (renamed from spec/services/jwt/container_registry_authentication_service_spec.rb)0
1 files changed, 0 insertions, 0 deletions
diff --git a/spec/services/jwt/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index a45410f0458..a45410f0458 100644
--- a/spec/services/jwt/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb