diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-05 18:54:36 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-05 18:54:36 +0200 |
| commit | c36544de9fa07f9d9aaa162a7c70a9dc644ae23b (patch) | |
| tree | e3b0434e5674263b6c05a7011eeb1bf68cf0757b /lib | |
| parent | c9bb083704f8910c9b1d2f538913b493813317e9 (diff) | |
| parent | fd8c30d1d7da92b45732e532890453b277428588 (diff) | |
| download | gitlab-ce-c36544de9fa07f9d9aaa162a7c70a9dc644ae23b.tar.gz | |
Merge branch 'kradydal/gitlab-ce-20989-disable-all-for-non-project-members'
See !6474.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/banzai/filter/user_reference_filter.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/banzai/filter/user_reference_filter.rb b/lib/banzai/filter/user_reference_filter.rb index e1ca7f4d24b..c6302b586d3 100644 --- a/lib/banzai/filter/user_reference_filter.rb +++ b/lib/banzai/filter/user_reference_filter.rb @@ -106,13 +106,17 @@ module Banzai project = context[:project] author = context[:author] - url = urls.namespace_project_url(project.namespace, project, - only_path: context[:only_path]) + if author && !project.team.member?(author) + link_text + else + url = urls.namespace_project_url(project.namespace, project, + only_path: context[:only_path]) - data = data_attribute(project: project.id, author: author.try(:id)) - text = link_text || User.reference_prefix + 'all' + data = data_attribute(project: project.id, author: author.try(:id)) + text = link_text || User.reference_prefix + 'all' - link_tag(url, data, text, 'All Project and Group Members') + link_tag(url, data, text, 'All Project and Group Members') + end end def link_to_namespace(namespace, link_text: nil) |