summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Praloran <jeanpralo@gmail.com>2017-03-17 16:40:57 +1300
committerJean Praloran <jeanpralo@gmail.com>2017-05-30 07:11:28 +1200
commitd890c6e81b696a5c02fe8138a76a4d113ee8ba93 (patch)
treea358383852900f6fc0b04abdaec66ae1fec5d15a
parent6c9da292418c606aefe34aab40923d5730ae9aa5 (diff)
downloadgitlab-ce-d890c6e81b696a5c02fe8138a76a4d113ee8ba93.tar.gz
fix typo and check
-rw-r--r--app/services/auth/container_registry_authentication_service.rb2
-rw-r--r--spec/services/auth/container_registry_authentication_service_spec.rb8
2 files changed, 2 insertions, 8 deletions
diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index 335cfdbc231..9622ce64d9f 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -122,7 +122,7 @@ module Auth
(requested_project == project || can?(current_user, :build_read_container_image, requested_project))
end
- def user_can_delete(requested_project)
+ def user_can_delete?(requested_project)
has_authentication_ability?(:admin_container_image) &&
can?(current_user, :admin_container_image, requested_project)
end
diff --git a/spec/services/auth/container_registry_authentication_service_spec.rb b/spec/services/auth/container_registry_authentication_service_spec.rb
index e8d222a2a7f..e617f1b0c04 100644
--- a/spec/services/auth/container_registry_authentication_service_spec.rb
+++ b/spec/services/auth/container_registry_authentication_service_spec.rb
@@ -278,7 +278,6 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
it_behaves_like 'an inaccessible'
it_behaves_like 'not a container repository factory'
end
-
end
end
@@ -287,15 +286,10 @@ describe Auth::ContainerRegistryAuthenticationService, services: true do
let(:current_user) { create(:user) }
let(:authentication_abilities) do
[
- :build_read_container_image,
- :build_create_container_image
+ :admin_container_image
]
end
- before do
- current_project.team << [current_project, :admin]
- end
-
it_behaves_like 'a valid token'
context 'allow to delete images' do