summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-11-16 16:33:46 +0000
committerFatih Acet <acetfatih@gmail.com>2016-11-16 16:33:46 +0000
commit579383efba3a6fe832ccee35c1e3c625137f8a65 (patch)
tree9abbe2a6b359f60a56ed2b034fedf54c2301060b /app
parent4e63411daae631c5e6221fe8ee674f55239e713b (diff)
parent02a2f3138d51f6f2dc1555f8aa3e802e1a5404de (diff)
downloadgitlab-ce-579383efba3a6fe832ccee35c1e3c625137f8a65.tar.gz
Merge branch 'issue-boards-counter-border-fix' into 'master'
Fixed issue boards counter border when unauthorized ## What does this MR do? When the user is unauthorized & view issue boards, the border on the counter will not be the whole way around. This fixes that. ## Screenshots (if relevant) ![Screen_Shot_2016-11-16_at_13.03.36](/uploads/54d97f7f4114044aad3bdc78961a31c8/Screen_Shot_2016-11-16_at_13.03.36.png) ## What are the relevant issue numbers? Closes #23664 See merge request !7501
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/boards/components/_board.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/boards/components/_board.html.haml b/app/views/projects/boards/components/_board.html.haml
index 47165c70097..a2e5118a9f3 100644
--- a/app/views/projects/boards/components/_board.html.haml
+++ b/app/views/projects/boards/components/_board.html.haml
@@ -7,7 +7,7 @@
data: { container: "body", placement: "bottom" } }
{{ list.title }}
.board-issue-count-holder.pull-right.clearfix{ "v-if" => 'list.type !== "blank"' }
- %span.board-issue-count.pull-left{ ":class" => '{ "has-btn": list.type !== "done" }' }
+ %span.board-issue-count.pull-left{ ":class" => '{ "has-btn": list.type !== "done" && !disabled }' }
{{ list.issuesSize }}
- if can?(current_user, :admin_issue, @project)
%button.btn.btn-small.btn-default.pull-right.has-tooltip{ type: "button",