Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
efabff4a7087
Commit
30d1d47d
authored
Apr 06, 2016
by
Alejandro Rodríguez
Browse files
Using project `path_with_namespace` in milestone's cross project references link text
parent
c0c922827187
Changes
2
Show whitespace changes
Inline
Side-by-side
lib/banzai/filter/milestone_reference_filter.rb
View file @
efabff4a
...
...
@@ -39,7 +39,7 @@ def object_link_text(object, matches)
if
context
[
:project
]
==
object
.
project
super
else
"
#{
escape_once
(
super
)
}
<i>in
#{
escape_once
(
object
.
project
.
name
_with_namespace
)
}
</i>"
.
"
#{
escape_once
(
super
)
}
<i>in
#{
escape_once
(
object
.
project
.
path
_with_namespace
)
}
</i>"
.
html_safe
end
end
...
...
spec/lib/banzai/filter/milestone_reference_filter_spec.rb
View file @
efabff4a
...
...
@@ -160,7 +160,7 @@
describe
'cross project milestone references'
do
let
(
:another_project
)
{
create
(
:empty_project
,
:public
)
}
let
(
:project_
name
)
{
another_project
.
name
_with_namespace
}
let
(
:project_
path
)
{
another_project
.
path
_with_namespace
}
let
(
:milestone
)
{
create
(
:milestone
,
project:
another_project
)
}
let
(
:reference
)
{
milestone
.
to_reference
(
project
)
}
...
...
@@ -174,13 +174,13 @@
end
it
'contains cross project content'
do
expect
(
result
.
css
(
'a'
).
first
.
text
).
to
eq
"
#{
milestone
.
name
}
in
#{
project_
name
}
"
expect
(
result
.
css
(
'a'
).
first
.
text
).
to
eq
"
#{
milestone
.
name
}
in
#{
project_
path
}
"
end
it
'escapes the name attribute'
do
allow_any_instance_of
(
Milestone
).
to
receive
(
:title
).
and_return
(
%{"></a>whatever<a title="}
)
doc
=
reference_filter
(
"See
#{
reference
}
"
)
expect
(
doc
.
css
(
'a'
).
first
.
text
).
to
eq
"
#{
milestone
.
name
}
in
#{
project_
name
}
"
expect
(
doc
.
css
(
'a'
).
first
.
text
).
to
eq
"
#{
milestone
.
name
}
in
#{
project_
path
}
"
end
end
end
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