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
e7733ad3
Commit
e7733ad3
authored
Oct 16, 2019
by
mfluharty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show related merge requests in pipeline view
parent
2ed0bc63
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
0 deletions
+21
-0
app/views/projects/pipelines/_info.html.haml
app/views/projects/pipelines/_info.html.haml
+6
-0
changelogs/unreleased/mfluharty-add-mr-links-to-pipeline-view.yml
...gs/unreleased/mfluharty-add-mr-links-to-pipeline-view.yml
+5
-0
spec/features/projects/pipelines/pipeline_spec.rb
spec/features/projects/pipelines/pipeline_spec.rb
+10
-0
No files found.
app/views/projects/pipelines/_info.html.haml
View file @
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
changelogs/unreleased/mfluharty-add-mr-links-to-pipeline-view.yml
0 → 100644
View file @
e7733ad3
---
title
:
Show related merge requests in pipeline view
merge_request
:
18697
author
:
type
:
added
spec/features/projects/pipelines/pipeline_spec.rb
View file @
e7733ad3
...
@@ -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
}
...
...
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