diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-13 16:43:49 -0500 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-13 16:43:49 -0500 |
| commit | 692b5e0b47931bf173e92dab3d01b502fd284285 (patch) | |
| tree | ce14cde539ae8994a2484e82ead22a08472514e1 /spec/features/container_registry_spec.rb | |
| parent | 9e318bd99deb90a93130cd4ef79e54f18555d4dc (diff) | |
| parent | 509654b3784da2a084a0c8303e9c6cc1498b8d2b (diff) | |
| download | gitlab-ce-692b5e0b47931bf173e92dab3d01b502fd284285.tar.gz | |
Merge branch 'docker-registry' into docker-registry-view
# Conflicts:
# app/controllers/jwt_controller.rb
# app/services/jwt/container_registry_authentication_service.rb
Diffstat (limited to 'spec/features/container_registry_spec.rb')
| -rw-r--r-- | spec/features/container_registry_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/container_registry_spec.rb b/spec/features/container_registry_spec.rb index 6c4d675fd6a..992da289028 100644 --- a/spec/features/container_registry_spec.rb +++ b/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(JWT::ContainerRegistryAuthenticationService).to receive(:full_access_token).and_return('token') + allow(Gitlab::JWT::ContainerRegistryAuthenticationService).to receive(:full_access_token).and_return('token') end describe 'GET /:project/container_registry' do |