diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 15:09:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 15:09:20 +0300 |
| commit | b84eeb256c4a780d902faee1f99ca9a711b3214a (patch) | |
| tree | 32918aadbea9210eace50efbce9afbfb8cd3ba84 /app/helpers | |
| parent | 53ae6b7e3f83591ad251a3f771f5bf3b8cf087ba (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/projects_helper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 4ed99b229b5..023790f7d87 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -720,8 +720,7 @@ module ProjectsHelper end def settings_container_registry_expiration_policy_available?(project) - Feature.enabled?(:registry_retention_policies_settings, project) && - Gitlab.config.registry.enabled && + Gitlab.config.registry.enabled && can?(current_user, :destroy_container_image, project) end end |