Commit eb5aab8f authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'mfluharty-add-mr-links-to-pipeline-view' into 'master'

Show related merge requests in pipeline view

See merge request gitlab-org/gitlab!18697
parents 7bd08e2a e7733ad3
...@@ -59,3 +59,9 @@ ...@@ -59,3 +59,9 @@
%span.js-details-content.hide %span.js-details-content.hide
= link_to @pipeline.sha, project_commit_path(@project, @pipeline.sha), class: "commit-sha commit-hash-full" = link_to @pipeline.sha, project_commit_path(@project, @pipeline.sha), class: "commit-sha commit-hash-full"
= clipboard_button(text: @pipeline.sha, title: _("Copy commit SHA")) = clipboard_button(text: @pipeline.sha, title: _("Copy commit SHA"))
.well-segment.related-merge-request-info
.icon-container
= sprite_icon("git-merge")
%span.related-merge-requests
= @pipeline.all_related_merge_request_text
---
title: Show related merge requests in pipeline view
merge_request: 18697
author:
type: added
...@@ -98,6 +98,16 @@ describe 'Pipeline', :js do ...@@ -98,6 +98,16 @@ describe 'Pipeline', :js do
end end
end end
it 'shows links to the related merge requests' do
visit_pipeline
within '.related-merge-request-info' do
pipeline.all_merge_requests.map do |merge_request|
expect(page).to have_link(project_merge_request_path(project, merge_request))
end
end
end
it_behaves_like 'showing user status' do it_behaves_like 'showing user status' do
let(:user_with_status) { pipeline.user } let(:user_with_status) { pipeline.user }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment