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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
051c0ec9
Commit
051c0ec9
authored
Jun 05, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'jivl-add-top-margin-related-merge-requests' into 'master'"
This reverts merge request !19379
parent
56b60c7b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
32 additions
and
33 deletions
+32
-33
app/views/projects/issues/_merge_requests.html.haml
app/views/projects/issues/_merge_requests.html.haml
+32
-33
No files found.
app/views/projects/issues/_merge_requests.html.haml
View file @
051c0ec9
-
if
@merge_requests
.
any?
-
if
@merge_requests
.
any?
.prepend-top-default
%h2
.merge-requests-title
%h2
.merge-requests-title
=
pluralize
(
@merge_requests
.
count
,
'Related Merge Request'
)
=
pluralize
(
@merge_requests
.
count
,
'Related Merge Request'
)
%ul
.unstyled-list.related-merge-requests
%ul
.unstyled-list.related-merge-requests
-
has_any_head_pipeline
=
@merge_requests
.
any?
(
&
:head_pipeline_id
)
-
has_any_head_pipeline
=
@merge_requests
.
any?
(
&
:head_pipeline_id
)
-
@merge_requests
.
each
do
|
merge_request
|
-
@merge_requests
.
each
do
|
merge_request
|
%li
%li
%span
.merge-request-ci-status
%span
.merge-request-ci-status
-
if
merge_request
.
head_pipeline
-
if
merge_request
.
head_pipeline
=
render_pipeline_status
(
merge_request
.
head_pipeline
)
=
render_pipeline_status
(
merge_request
.
head_pipeline
)
-
elsif
has_any_head_pipeline
-
elsif
has_any_head_pipeline
=
icon
(
'blank fw'
)
=
icon
(
'blank fw'
)
%span
.merge-request-id
%span
.merge-request-id
=
merge_request
.
to_reference
=
merge_request
.
to_reference
%span
.merge-request-info
%span
.merge-request-info
%strong
%strong
=
link_to
merge_request
.
title
,
merge_request_path
(
merge_request
),
class:
"row_title"
=
link_to
merge_request
.
title
,
merge_request_path
(
merge_request
),
class:
"row_title"
-
unless
@issue
.
project
.
id
==
merge_request
.
target_project
.
id
-
unless
@issue
.
project
.
id
==
merge_request
.
target_project
.
id
in
in
-
project
=
merge_request
.
target_project
-
project
=
merge_request
.
target_project
=
link_to
project
.
full_name
,
project_path
(
project
)
=
link_to
project
.
full_name
,
project_path
(
project
)
-
if
merge_request
.
merged?
-
if
merge_request
.
merged?
%span
.merge-request-status.prepend-left-10.merged
%span
.merge-request-status.prepend-left-10.merged
Merged
Merged
-
elsif
merge_request
.
closed?
-
elsif
merge_request
.
closed?
%span
.merge-request-status.prepend-left-10.closed
%span
.merge-request-status.prepend-left-10.closed
Closed
Closed
-
else
-
else
%span
.merge-request-status.prepend-left-10.open
%span
.merge-request-status.prepend-left-10.open
Open
Open
-
if
@closed_by_merge_requests
.
present?
-
if
@closed_by_merge_requests
.
present?
%li
%li
=
render
partial:
'projects/issues/closed_by_box'
,
locals:
{
merge_request_count:
@merge_requests
.
count
}
=
render
partial:
'projects/issues/closed_by_box'
,
locals:
{
merge_request_count:
@merge_requests
.
count
}
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