summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-05-14 11:15:19 -0500
committerKamil Trzcinski <ayufan@ayufan.eu>2016-05-14 11:15:33 -0500
commit654d5ad3f42732df77553bfbc2230f17d9185267 (patch)
treee732669d38adb58696ac7e9b78dbd1d3a835340c /app/controllers
parent906c880400a36abd34426c634d2a9f6086909db0 (diff)
parent63cdf1aeb04b9694c0b6d44b1141868fcc5a0904 (diff)
downloadgitlab-ce-654d5ad3f42732df77553bfbc2230f17d9185267.tar.gz
Merge branch 'docker-registry' into docker-registry-view
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/jwt_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/jwt_controller.rb b/app/controllers/jwt_controller.rb
index 568f14a713a..5b9a04c249a 100644
--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -4,7 +4,7 @@ class JwtController < ApplicationController
before_action :authenticate_project_or_user
SERVICES = {
- ::Gitlab::JWT::ContainerRegistryAuthenticationService::AUDIENCE => ::Gitlab::JWT::ContainerRegistryAuthenticationService,
+ Auth::ContainerRegistryAuthenticationService::AUDIENCE => Auth::ContainerRegistryAuthenticationService,
}
def auth