diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/helpers/groups_helper.rb | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/helpers/groups_helper.rb')
-rw-r--r-- | app/helpers/groups_helper.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 61c9bd74451..eb80acd869f 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -28,6 +28,7 @@ module GroupsHelper def group_packages_nav_link_paths %w[ + groups/packages#index groups/container_registries#index ] end @@ -129,7 +130,7 @@ module GroupsHelper end def remove_group_message(group) - _("You are going to remove %{group_name}, this will also remove all of its subgroups and projects. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?") % + _("You are going to remove %{group_name}, this will also delete all of its subgroups and projects. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?") % { group_name: group.name } end @@ -157,6 +158,15 @@ module GroupsHelper groups.to_json end + def group_packages_nav? + group_packages_list_nav? || + group_container_registry_nav? + end + + def group_packages_list_nav? + @group.packages_feature_enabled? + end + private def get_group_sidebar_links |