summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wortschack <mwortschack@gitlab.com>2018-11-29 14:44:20 +0100
committerMartin Wortschack <mwortschack@gitlab.com>2018-11-29 14:44:20 +0100
commit18f6ec4d53383fdd640e56eba0ed5a113ff3bab0 (patch)
treecb56a1cb4f0cf99c0cd08e20809b547342a1eb8f
parent4885d9e2839156d15339102dbaff85b868347655 (diff)
downloadgitlab-ce-51944-redesign-project-lists-ui.tar.gz
Change order of checks51944-redesign-project-lists-ui
-rw-r--r--app/helpers/projects_helper.rb4
1 files 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