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
Jérome Perrin
gitlab-ce
Commits
39754c6c
Commit
39754c6c
authored
Nov 15, 2016
by
Didem Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added colored labels to related MR list.
parent
891465ba
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
8 deletions
+36
-8
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+21
-3
app/views/projects/issues/_merge_requests.html.haml
app/views/projects/issues/_merge_requests.html.haml
+11
-5
changelogs/unreleased/related-mr-labels.yml
changelogs/unreleased/related-mr-labels.yml
+4
-0
No files found.
app/assets/stylesheets/pages/issues.scss
View file @
39754c6c
...
@@ -55,9 +55,27 @@ ul.related-merge-requests > li {
...
@@ -55,9 +55,27 @@ ul.related-merge-requests > li {
}
}
.merge-request-status
{
.merge-request-status
{
color
:
$gl-gray
;
font-size
:
13px
;
font-size
:
15px
;
padding
:
0px
5px
;
font-weight
:
bold
;
color
:
#FFF
;
height
:
20px
;
border-radius
:
3px
;
line-height
:
18px
;
&
.merged
{
border
:
1px
solid
#2A96CC
;
background
:
#2D9FD8
;
}
&
.closed
{
border
:
1px
solid
#C5254D
;
background
:
#D62954
;
}
&
.open
{
border
:
1px
solid
#2EA65E
;
background
:
#31AF64
;
}
}
}
.merge-request
,
.merge-request
,
...
...
app/views/projects/issues/_merge_requests.html.haml
View file @
39754c6c
...
@@ -19,11 +19,17 @@
...
@@ -19,11 +19,17 @@
in
in
-
project
=
merge_request
.
target_project
-
project
=
merge_request
.
target_project
=
link_to
project
.
name_with_namespace
,
namespace_project_path
(
project
.
namespace
,
project
)
=
link_to
project
.
name_with_namespace
,
namespace_project_path
(
project
.
namespace
,
project
)
%span
.merge-request-status.prepend-left-10
-
if
merge_request
.
merged?
-
if
merge_request
.
merged?
MERGED
%span
.merge-request-status.prepend-left-10.merged
Merged
-
elsif
merge_request
.
closed?
-
elsif
merge_request
.
closed?
CLOSED
%span
.merge-request-status.prepend-left-10.closed
Closed
-
else
%span
.merge-request-status.prepend-left-10.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
}
changelogs/unreleased/related-mr-labels.yml
0 → 100644
View file @
39754c6c
---
title
:
Added colored labels to related MR list.
merge_request
:
7486
author
:
Didem Acet
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