Skip to content

Commit 7a72616

Browse files
committed
Merge branch '53533-fix-broken-link' into 'master'
Renders unescaped `sprinft` string Closes #53533 See merge request gitlab-org/gitlab-ce!22807
2 parents b4ecbef + 0c24995 commit 7a72616

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ export default {
7171
linkStart: `<a href="${this.troubleshootingDocsPath}">`,
7272
linkEnd: '</a>',
7373
},
74+
false,
7475
);
7576
},
7677
},
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Render unescaped link for failed pipeline status
3+
merge_request: 22807
4+
author:
5+
type: fixed

spec/features/merge_request/user_sees_merge_widget_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
# Wait for the `ci_status` and `merge_check` requests
180180
wait_for_requests
181181

182-
expect(page).to have_text(%r{Could not retrieve the pipeline status\. For troubleshooting steps, read the <a href=\".+\">documentation\.</a>})
182+
expect(page).to have_text("Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.")
183183
end
184184
end
185185

spec/features/merge_request/user_sees_pipelines_spec.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
visit project_merge_request_path(project, merge_request)
4242
wait_for_requests
4343

44-
expect(page.find('.ci-widget')).to have_text(
45-
%r{Could not retrieve the pipeline status\. For troubleshooting steps, read the <a href=\".+\">documentation\.</a>})
44+
expect(page.find('.ci-widget')).to have_text("Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.")
4645
end
4746
end
4847

spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ describe('MRWidgetPipeline', () => {
7373
});
7474

7575
expect(vm.$el.querySelector('.media-body').textContent.trim()).toContain(
76-
'Could not retrieve the pipeline status. For troubleshooting steps, read the <a href="help">documentation.</a>',
76+
'Could not retrieve the pipeline status. For troubleshooting steps, read the documentation.',
7777
);
7878
});
7979

0 commit comments

Comments
 (0)