Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-09-15 11:34:53 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-09-15 11:34:53 +0300
commit6b381f3fdf00c7eeb971f365bde2a41f0cecf944 (patch)
treeb3e661a6dc8a75149889b4a8aa7b4d7fbdb7369b /lib/gitlab/auth.rb
parent79e4bb8d0b3b74ddd185677e4828d737788c3b1a (diff)
Use `build_read_container_image` and use `build_download_code`
Diffstat (limited to 'lib/gitlab/auth.rb')
-rw-r--r--lib/gitlab/auth.rb16
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index a792db027ff..6a55c50c3f3 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -78,7 +78,7 @@ module Gitlab
service = project.public_send("#{underscored_service}_service")
if service && service.activated? && service.valid_token?(password)
- Result.new(nil, project, :ci, restricted_capabilities)
+ Result.new(nil, project, :ci, build_capabilities)
end
end
end
@@ -124,25 +124,27 @@ module Gitlab
if build.user
# If user is assigned to build, use restricted credentials of user
- Result.new(build.user, build.project, :build, restricted_capabilities)
+ Result.new(build.user, build.project, :build, build_capabilities)
else
# Otherwise use generic CI credentials (backward compatibility)
- Result.new(nil, build.project, :ci, restricted_capabilities)
+ Result.new(nil, build.project, :ci, build_capabilities)
end
end
private
- def restricted_capabilities
+ def build_capabilities
[
:read_project,
- :restricted_download_code,
- :restricted_read_container_image
+ :build_download_code,
+ :build_read_container_image,
+ :build_create_container_image
]
end
def read_capabilities
- restricted_capabilities + [
+ [
+ :read_project,
:download_code,
:read_container_image
]