diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/helpers/groups_helper.rb | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/helpers/groups_helper.rb')
-rw-r--r-- | app/helpers/groups_helper.rb | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 26a5df321cd..400ad721b06 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -5,15 +5,9 @@ module GroupsHelper %w[ groups#activity groups#subgroups - ].tap do |paths| - extra_routes = if sidebar_refactor_disabled? - ['groups#show', 'groups#details'] - else - ['labels#index', 'group_members#index'] - end - - paths.concat(extra_routes) - end + labels#index + group_members#index + ] end def group_settings_nav_link_paths @@ -45,11 +39,7 @@ module GroupsHelper end def group_information_title(group) - if Feature.enabled?(:sidebar_refactor, current_user, default_enabled: :yaml) - group.subgroup? ? _('Subgroup information') : _('Group information') - else - group.subgroup? ? _('Subgroup overview') : _('Group overview') - end + group.subgroup? ? _('Subgroup information') : _('Group information') end def group_container_registry_nav? |