diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-25 03:09:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-25 03:09:26 +0300 |
| commit | 5d6119a1a4d31009ea7aee400c8462e897ddc26c (patch) | |
| tree | b648d64a6cbcb9195325a258715ba23633f88984 /app/helpers/deploy_tokens_helper.rb | |
| parent | d627a16f3d10e2188ae2b2797e042f4c324718db (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, 2 insertions, 8 deletions
diff --git a/app/helpers/deploy_tokens_helper.rb b/app/helpers/deploy_tokens_helper.rb index eeeeb14d991..80a5bb44c69 100644 --- a/app/helpers/deploy_tokens_helper.rb +++ b/app/helpers/deploy_tokens_helper.rb @@ -7,14 +7,8 @@ module DeployTokensHelper Rails.env.test? end - def container_registry_enabled?(subject) + def container_registry_enabled?(project) Gitlab.config.registry.enabled && - 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) + can?(current_user, :read_container_image, project) end end |