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
3c078cef
Commit
3c078cef
authored
9 years ago
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adds exclamation point when assigned user cannot merge
parent
b64b4c71
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+5
-0
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+3
-0
No files found.
app/assets/stylesheets/pages/projects.scss
View file @
3c078cef
...
@@ -558,3 +558,8 @@ pre.light-well {
...
@@ -558,3 +558,8 @@ pre.light-well {
width
:
101%
;
width
:
101%
;
}
}
}
}
.cannot-be-merged
,
.cannot-be-merged
:hover
{
color
:
#E62958
;
margin-top
:
2px
;
}
This diff is collapsed.
Click to expand it.
app/views/shared/issuable/_sidebar.html.haml
View file @
3c078cef
...
@@ -10,6 +10,9 @@
...
@@ -10,6 +10,9 @@
.value
.value
-
if
issuable
.
assignee
-
if
issuable
.
assignee
%strong
=
link_to_member
(
@project
,
issuable
.
assignee
,
size:
24
)
%strong
=
link_to_member
(
@project
,
issuable
.
assignee
,
size:
24
)
-
if
issuable
.
instance_of?
(
MergeRequest
)
&&
!
@merge_request
.
can_be_merged_by?
(
issuable
.
assignee
)
%a
.pull-right.cannot-be-merged
{
href
:'#'
,
data
:{
toggle
:'tooltip'
},
title
:'Not allowed to merge'
}
=
icon
(
'exclamation-triangle'
)
-
else
-
else
.light
None
.light
None
...
...
This diff is collapsed.
Click to expand it.
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