Merge branch 'speed-up-labels-api' into 'master'

Remove label issue and MR counts from default API responses

See merge request gitlab-org/gitlab-ce!31543

1 files changed, 10 insertions, 8 deletions

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 1496b5c5f9e..09253ab6b0e 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1090,16 +1090,18 @@ module API
     end
 
     class Label < LabelBasic
-      expose :open_issues_count do |label, options|
-        label.open_issues_count(options[:current_user])
-      end
+      with_options if: lambda { |_, options| options[:with_counts] } do
+        expose :open_issues_count do |label, options|
+          label.open_issues_count(options[:current_user])
+        end
 
-      expose :closed_issues_count do |label, options|
-        label.closed_issues_count(options[:current_user])
-      end
+        expose :closed_issues_count do |label, options|
+          label.closed_issues_count(options[:current_user])
+        end
 
-      expose :open_merge_requests_count do |label, options|
-        label.open_merge_requests_count(options[:current_user])
+        expose :open_merge_requests_count do |label, options|
+          label.open_merge_requests_count(options[:current_user])
+        end
       end
 
       expose :subscribed do |label, options|