Merge branch 'docker-registry' into docker-registry-view

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

app/models/project.rb

@@ -330,7 +330,7 @@ class Project < ActiveRecord::Base
 
   def container_registry_repository
     @container_registry_repository ||= begin
-      token = Gitlab::JWT::ContainerRegistryAuthenticationService.full_access_token(path_with_namespace)
+      token = Auth::ContainerRegistryAuthenticationService.full_access_token(path_with_namespace)
       url = Gitlab.config.registry.api_url
       host_port = Gitlab.config.registry.host_port
       registry = ContainerRegistry::Registry.new(url, token: token, path: host_port)

app/services/jwt/container_registry_authentication_service.rb → app/services/auth/container_registry_authentication_service.rb

-module Gitlab
-  module JWT
+module Auth
   class ContainerRegistryAuthenticationService < BaseService
     AUDIENCE = 'container_registry'
 
@@ -67,18 +66,6 @@ module Gitlab
       { type: type, name: name, actions: actions } if actions.present?
     end
 
-<<<<<<< HEAD
-    def can_access?(requested_project, requested_action)
-      return false unless requested_project.container_registry_enabled?
-
-      case requested_action
-      when 'pull'
-        requested_project == project || can?(current_user, :read_container_registry, requested_project)
-      when 'push'
-        requested_project == project || can?(current_user, :create_container_registry, requested_project)
-      else
-        false
-=======
     def can_access?(requested_project, requested_action)
       case requested_action
       when 'pull'
@@ -88,12 +75,10 @@ module Gitlab
       else
         false
       end
->>>>>>> docker-registry
     end
 
     def registry
       Gitlab.config.registry
     end
   end
-  end
 end

spec/features/container_registry_spec.rb

@@ -16,7 +16,7 @@ describe "Container Registry" do
     project.team << [@user, :developer]
     stub_container_registry(*tags)
     allow(Gitlab.config.registry).to receive_messages(registry_settings)
-    allow(Gitlab::JWT::ContainerRegistryAuthenticationService).to receive(:full_access_token).and_return('token')
+    allow(Auth::ContainerRegistryAuthenticationService).to receive(:full_access_token).and_return('token')
   end
 
   describe 'GET /:project/container_registry' do

spec/services/jwt/container_registry_authentication_service_spec.rb

 require 'spec_helper'
 
-describe Gitlab::JWT::ContainerRegistryAuthenticationService, services: true do
+describe Auth::ContainerRegistryAuthenticationService, services: true do
   let(:current_project) { nil }
   let(:current_user) { nil }
   let(:current_params) { {} }