diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-13 08:59:56 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-18 20:12:06 -0500 |
| commit | 3c078cef41305d2c4126501f5de571143c19e147 (patch) | |
| tree | ac6b3db899d1eeff1a1f1fa71122839fb2dba969 | |
| parent | b64b4c711f91423002706d8b8494b83622fb336f (diff) | |
| download | gitlab-ce-3c078cef41305d2c4126501f5de571143c19e147.tar.gz | |
adds exclamation point when assigned user cannot merge
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 5 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 3a87b71078d..b14033720b5 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -558,3 +558,8 @@ pre.light-well { width: 101%; } } + +.cannot-be-merged, .cannot-be-merged:hover { + color: #E62958; + margin-top: 2px; +} diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 9f4a7098ea2..1eb14b51533 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -10,6 +10,9 @@ .value - if issuable.assignee %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 .light None |