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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
2ab9f090
Commit
2ab9f090
authored
May 30, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
d4a999b9
c18136ae
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
app/presenters/ci/pipeline_presenter.rb
app/presenters/ci/pipeline_presenter.rb
+1
-1
changelogs/unreleased/609120-ref-link.yml
changelogs/unreleased/609120-ref-link.yml
+5
-0
spec/features/projects/pipelines/pipeline_spec.rb
spec/features/projects/pipelines/pipeline_spec.rb
+6
-0
No files found.
app/presenters/ci/pipeline_presenter.rb
View file @
2ab9f090
...
...
@@ -43,7 +43,7 @@ module Ci
if
pipeline
.
ref_exists?
_
(
"for %{link_to_pipeline_ref}"
).
html_safe
%
{
link_to_pipeline_ref:
link_to_pipeline_ref
}
else
_
(
"for %{ref}"
)
%
{
ref:
content_tag
(
:span
,
pipeline
.
ref
,
class:
'ref-name'
)
}
_
(
"for %{ref}"
)
.
html_safe
%
{
ref:
content_tag
(
:span
,
pipeline
.
ref
,
class:
'ref-name'
)
}
end
end
end
...
...
changelogs/unreleased/609120-ref-link.yml
0 → 100644
View file @
2ab9f090
---
title
:
Fixes Ref link being displayed as raw HTML in the Pipelines page
merge_request
:
28823
author
:
type
:
fixed
spec/features/projects/pipelines/pipeline_spec.rb
View file @
2ab9f090
...
...
@@ -328,6 +328,12 @@ describe 'Pipeline', :js do
expect
(
page
).
not_to
have_link
(
pipeline
.
ref
)
expect
(
page
).
to
have_content
(
pipeline
.
ref
)
end
it
'does not render render raw HTML to the pipeline ref'
do
page
.
within
'.pipeline-info'
do
expect
(
page
).
not_to
have_content
(
'<span class="ref-name"'
)
end
end
end
context
'when pipeline is detached merge request pipeline'
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