diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-09 08:46:48 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-09 08:46:48 -0500 |
| commit | 6d205f9d395594b0ce2ea94d3edb6a324df18aa0 (patch) | |
| tree | dec1f0f977550f5daecb18dfe71dfd875bbd1d3a /app/views/shared | |
| parent | 58726ffc5fca2b4d40a5b099e463c0f13522be5b (diff) | |
| download | gitlab-ce-6d205f9d395594b0ce2ea94d3edb6a324df18aa0.tar.gz | |
Remove unnecessary if check
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/issuable/_sidebar_assignees.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_sidebar_assignees.html.haml b/app/views/shared/issuable/_sidebar_assignees.html.haml index 233fdcbb849..c36a45098a8 100644 --- a/app/views/shared/issuable/_sidebar_assignees.html.haml +++ b/app/views/shared/issuable/_sidebar_assignees.html.haml @@ -14,7 +14,7 @@ .value.hide-collapsed - if issuable.assignee = link_to_member(@project, issuable.assignee, size: 32, extra_class: 'bold') do - - if issuable.instance_of?(MergeRequest) && !issuable.can_be_merged_by?(issuable.assignee) + - if !issuable.can_be_merged_by?(issuable.assignee) %span.pull-right.cannot-be-merged{ data: { toggle: 'tooltip', placement: 'left' }, title: 'Not allowed to merge' } = icon('exclamation-triangle', 'aria-hidden': 'true') %span.username |