Merge branch 'kradydal/gitlab-ce-20989-disable-all-for-non-project-members'

See !6474.
This commit is contained in:
Rémy Coutable 2016-10-05 18:54:36 +02:00
commit c36544de9f
3 changed files with 19 additions and 5 deletions

View file

@ -50,6 +50,7 @@ v 8.13.0 (unreleased)
- API: expose pipeline data in builds API (!6502, Guilherme Salazar)
- Notify the Merger about merge after successful build (Dimitris Karakasilis)
- Reduce queries needed to find users using their SSH keys when pushing commits
- Prevent rendering the link to all when the author has no access (Katarzyna Kobierska Ula Budziszewska)
- Fix broken repository 500 errors in project list
- Fix Pipeline list commit column width should be adjusted
- Close todos when accepting merge requests via the API !6486 (tonygambone)

View file

@ -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)

View file

@ -31,13 +31,16 @@ describe Banzai::Filter::UserReferenceFilter, lib: true do
end
it 'supports a special @all mention' do
project.team << [user, :developer]
doc = reference_filter("Hey #{reference}", author: user)
expect(doc.css('a').length).to eq 1
expect(doc.css('a').first.attr('href'))
.to eq urls.namespace_project_url(project.namespace, project)
end
it 'includes a data-author attribute when there is an author' do
project.team << [user, :developer]
doc = reference_filter(reference, author: user)
expect(doc.css('a').first.attr('data-author')).to eq(user.id.to_s)
@ -48,6 +51,12 @@ describe Banzai::Filter::UserReferenceFilter, lib: true do
expect(doc.css('a').first.has_attribute?('data-author')).to eq(false)
end
it 'ignores reference to all when the user is not a project member' do
doc = reference_filter("Hey #{reference}", author: user)
expect(doc.css('a').length).to eq 0
end
end
context 'mentioning a user' do