diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-30 12:08:39 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-30 12:08:39 +0300 |
commit | 6462f5216f381ffb04665581e71b70e859a6f398 (patch) | |
tree | 980c4c4bf913fae0316a1b7fcf63ddfcfd7b762d /app/helpers/search_helper.rb | |
parent | d91998617f3825e906b35f4406d641af7f59e832 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/search_helper.rb')
-rw-r--r-- | app/helpers/search_helper.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 704a1471b87..3f182e3ebca 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -150,7 +150,7 @@ module SearchHelper if @project && @project.repository.root_ref ref = @ref || @project.repository.root_ref - [ + result = [ { category: "In this project", label: _("Files"), url: project_tree_path(@project, ref) }, { category: "In this project", label: _("Commits"), url: project_commits_path(@project, ref) }, { category: "In this project", label: _("Network"), url: project_network_path(@project, ref) }, @@ -162,6 +162,12 @@ module SearchHelper { category: "In this project", label: _("Members"), url: project_project_members_path(@project) }, { category: "In this project", label: _("Wiki"), url: project_wikis_path(@project) } ] + + if can?(current_user, :read_feature_flag, @project) + result << { category: "In this project", label: _("Feature Flags"), url: project_feature_flags_path(@project) } + end + + result else [] end |