From 18f6ec4d53383fdd640e56eba0ed5a113ff3bab0 Mon Sep 17 00:00:00 2001 From: Martin Wortschack Date: Thu, 29 Nov 2018 14:44:20 +0100 Subject: Change order of checks --- app/helpers/projects_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index afd81e359f3..49f59612454 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -507,11 +507,11 @@ module ProjectsHelper end def show_merge_request_count?(merge_requests, compact_mode) - Feature.enabled?(:project_list_show_mr_count, default_enabled: true) && merge_requests && !compact_mode + merge_requests && !compact_mode && Feature.enabled?(:project_list_show_mr_count, default_enabled: true) end def show_issue_count?(issues, compact_mode) - Feature.enabled?(:project_list_show_issue_count, default_enabled: true) && issues && !compact_mode + issues && !compact_mode && Feature.enabled?(:project_list_show_issue_count, default_enabled: true) end def sidebar_projects_paths -- cgit v1.2.1