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
0c249957
Commit
0c249957
authored
Nov 06, 2018
by
Filipa Lacerda
Committed by
Phil Hughes
Nov 06, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renders unescaped `sprinft` string
parent
b4ecbef2
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
4 deletions
+9
-4
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
...ue_merge_request_widget/components/mr_widget_pipeline.vue
+1
-0
changelogs/unreleased/53533-fix-broken-link.yml
changelogs/unreleased/53533-fix-broken-link.yml
+5
-0
spec/features/merge_request/user_sees_merge_widget_spec.rb
spec/features/merge_request/user_sees_merge_widget_spec.rb
+1
-1
spec/features/merge_request/user_sees_pipelines_spec.rb
spec/features/merge_request/user_sees_pipelines_spec.rb
+1
-2
spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
...ripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
View file @
0c249957
...
@@ -71,6 +71,7 @@ export default {
...
@@ -71,6 +71,7 @@ export default {
linkStart
:
`<a href="
${
this
.
troubleshootingDocsPath
}
">`
,
linkStart
:
`<a href="
${
this
.
troubleshootingDocsPath
}
">`
,
linkEnd
:
'
</a>
'
,
linkEnd
:
'
</a>
'
,
},
},
false
,
);
);
},
},
},
},
...
...
changelogs/unreleased/53533-fix-broken-link.yml
0 → 100644
View file @
0c249957
---
title
:
Render unescaped link for failed pipeline status
merge_request
:
22807
author
:
type
:
fixed
spec/features/merge_request/user_sees_merge_widget_spec.rb
View file @
0c249957
...
@@ -179,7 +179,7 @@ describe 'Merge request > User sees merge widget', :js do
...
@@ -179,7 +179,7 @@ describe 'Merge request > User sees merge widget', :js do
# Wait for the `ci_status` and `merge_check` requests
# Wait for the `ci_status` and `merge_check` requests
wait_for_requests
wait_for_requests
expect
(
page
).
to
have_text
(
%r{Could not retrieve the pipeline status
\.
For troubleshooting steps, read the <a href=
\"
.+
\"
>documentation
\.
</a>}
)
expect
(
page
).
to
have_text
(
"Could not retrieve the pipeline status. For troubleshooting steps, read the documentation."
)
end
end
end
end
...
...
spec/features/merge_request/user_sees_pipelines_spec.rb
View file @
0c249957
...
@@ -41,8 +41,7 @@ describe 'Merge request > User sees pipelines', :js do
...
@@ -41,8 +41,7 @@ describe 'Merge request > User sees pipelines', :js do
visit
project_merge_request_path
(
project
,
merge_request
)
visit
project_merge_request_path
(
project
,
merge_request
)
wait_for_requests
wait_for_requests
expect
(
page
.
find
(
'.ci-widget'
)).
to
have_text
(
expect
(
page
.
find
(
'.ci-widget'
)).
to
have_text
(
"Could not retrieve the pipeline status. For troubleshooting steps, read the documentation."
)
%r{Could not retrieve the pipeline status
\.
For troubleshooting steps, read the <a href=
\"
.+
\"
>documentation
\.
</a>}
)
end
end
end
end
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
View file @
0c249957
...
@@ -73,7 +73,7 @@ describe('MRWidgetPipeline', () => {
...
@@ -73,7 +73,7 @@ describe('MRWidgetPipeline', () => {
});
});
expect
(
vm
.
$el
.
querySelector
(
'
.media-body
'
).
textContent
.
trim
()).
toContain
(
expect
(
vm
.
$el
.
querySelector
(
'
.media-body
'
).
textContent
.
trim
()).
toContain
(
'
Could not retrieve the pipeline status. For troubleshooting steps, read the
<a href="help">documentation.</a>
'
,
'
Could not retrieve the pipeline status. For troubleshooting steps, read the
documentation.
'
,
);
);
});
});
...
...
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