diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 18:07:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 18:07:42 +0000 |
commit | 580622bdb3c762a8e89facd8a3946881ee480442 (patch) | |
tree | 3ac9d759da23f78f95f50684bd238a9f76839538 /app/helpers | |
parent | b211a4ea14d5e9ed9b0c248a4e8c5c1d85b542cb (diff) | |
download | gitlab-ce-580622bdb3c762a8e89facd8a3946881ee480442.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/groups_helper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 661197e84ae..5abe6a635e0 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -22,8 +22,7 @@ module GroupsHelper def group_container_registry_nav? Gitlab.config.registry.enabled && - can?(current_user, :read_container_image, @group) && - Feature.enabled?(:group_container_registry_browser, @group) + can?(current_user, :read_container_image, @group) end def group_sidebar_links |