Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
c36544de
Commit
c36544de
authored
Oct 05, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'kradydal/gitlab-ce-20989-disable-all-for-non-project-members'
See !6474.
parents
c9bb0837
fd8c30d1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
5 deletions
+19
-5
CHANGELOG
CHANGELOG
+1
-0
lib/banzai/filter/user_reference_filter.rb
lib/banzai/filter/user_reference_filter.rb
+9
-5
spec/lib/banzai/filter/user_reference_filter_spec.rb
spec/lib/banzai/filter/user_reference_filter_spec.rb
+9
-0
No files found.
CHANGELOG
View file @
c36544de
...
@@ -50,6 +50,7 @@ v 8.13.0 (unreleased)
...
@@ -50,6 +50,7 @@ v 8.13.0 (unreleased)
- API: expose pipeline data in builds API (!6502, Guilherme Salazar)
- API: expose pipeline data in builds API (!6502, Guilherme Salazar)
- Notify the Merger about merge after successful build (Dimitris Karakasilis)
- Notify the Merger about merge after successful build (Dimitris Karakasilis)
- Reduce queries needed to find users using their SSH keys when pushing commits
- 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 broken repository 500 errors in project list
- Fix Pipeline list commit column width should be adjusted
- Fix Pipeline list commit column width should be adjusted
- Close todos when accepting merge requests via the API !6486 (tonygambone)
- Close todos when accepting merge requests via the API !6486 (tonygambone)
...
...
lib/banzai/filter/user_reference_filter.rb
View file @
c36544de
...
@@ -106,13 +106,17 @@ module Banzai
...
@@ -106,13 +106,17 @@ module Banzai
project
=
context
[
:project
]
project
=
context
[
:project
]
author
=
context
[
:author
]
author
=
context
[
:author
]
url
=
urls
.
namespace_project_url
(
project
.
namespace
,
project
,
if
author
&&
!
project
.
team
.
member?
(
author
)
only_path:
context
[
:only_path
])
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
))
data
=
data_attribute
(
project:
project
.
id
,
author:
author
.
try
(
:id
))
text
=
link_text
||
User
.
reference_prefix
+
'all'
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
end
def
link_to_namespace
(
namespace
,
link_text:
nil
)
def
link_to_namespace
(
namespace
,
link_text:
nil
)
...
...
spec/lib/banzai/filter/user_reference_filter_spec.rb
View file @
c36544de
...
@@ -31,13 +31,16 @@ describe Banzai::Filter::UserReferenceFilter, lib: true do
...
@@ -31,13 +31,16 @@ describe Banzai::Filter::UserReferenceFilter, lib: true do
end
end
it
'supports a special @all mention'
do
it
'supports a special @all mention'
do
project
.
team
<<
[
user
,
:developer
]
doc
=
reference_filter
(
"Hey
#{
reference
}
"
,
author:
user
)
doc
=
reference_filter
(
"Hey
#{
reference
}
"
,
author:
user
)
expect
(
doc
.
css
(
'a'
).
length
).
to
eq
1
expect
(
doc
.
css
(
'a'
).
length
).
to
eq
1
expect
(
doc
.
css
(
'a'
).
first
.
attr
(
'href'
))
expect
(
doc
.
css
(
'a'
).
first
.
attr
(
'href'
))
.
to
eq
urls
.
namespace_project_url
(
project
.
namespace
,
project
)
.
to
eq
urls
.
namespace_project_url
(
project
.
namespace
,
project
)
end
end
it
'includes a data-author attribute when there is an author'
do
it
'includes a data-author attribute when there is an author'
do
project
.
team
<<
[
user
,
:developer
]
doc
=
reference_filter
(
reference
,
author:
user
)
doc
=
reference_filter
(
reference
,
author:
user
)
expect
(
doc
.
css
(
'a'
).
first
.
attr
(
'data-author'
)).
to
eq
(
user
.
id
.
to_s
)
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
...
@@ -48,6 +51,12 @@ describe Banzai::Filter::UserReferenceFilter, lib: true do
expect
(
doc
.
css
(
'a'
).
first
.
has_attribute?
(
'data-author'
)).
to
eq
(
false
)
expect
(
doc
.
css
(
'a'
).
first
.
has_attribute?
(
'data-author'
)).
to
eq
(
false
)
end
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
end
context
'mentioning a user'
do
context
'mentioning a user'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment