diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-24 21:09:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-24 21:09:03 +0300 |
| commit | c59765a50abd6a235220fd895f5de78038c243a8 (patch) | |
| tree | 6cacf61d1746e2d54149c028ecd3f187128cd7da /app/helpers/deploy_tokens_helper.rb | |
| parent | 4c5468b40825debc2b7bbe08b975dedd2f7f1523 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/deploy_tokens_helper.rb')
| -rw-r--r-- | app/helpers/deploy_tokens_helper.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/helpers/deploy_tokens_helper.rb b/app/helpers/deploy_tokens_helper.rb index 80a5bb44c69..eeeeb14d991 100644 --- a/app/helpers/deploy_tokens_helper.rb +++ b/app/helpers/deploy_tokens_helper.rb @@ -7,8 +7,14 @@ module DeployTokensHelper Rails.env.test? end - def container_registry_enabled?(project) + def container_registry_enabled?(subject) Gitlab.config.registry.enabled && - can?(current_user, :read_container_image, project) + can?(current_user, :read_container_image, subject) + end + + def packages_registry_enabled?(subject) + Gitlab.config.packages.enabled && + subject.feature_available?(:packages) && + can?(current_user, :read_package, subject) end end |