Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 1 deletions

diff --git a/lib/api/entities/milestone_with_stats.rb b/lib/api/entities/milestone_with_stats.rb
new file mode 100644
index 00000000000..33fa322573b
--- /dev/null
+++ b/lib/api/entities/milestone_with_stats.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class MilestoneWithStats < Entities::Milestone
+      expose :issue_stats do
+        expose :total_issues_count, as: :total
+        expose :closed_issues_count, as: :closed
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/release.rb b/lib/api/entities/release.rb
index dc4b91e594e..292b2e0102b 100644
--- a/lib/api/entities/release.rb
+++ b/lib/api/entities/release.rb
@@ -18,7 +18,7 @@ module API
       expose :author, using: Entities::UserBasic, if: -> (release, _) { release.author.present? }
       expose :commit, using: Entities::Commit, if: ->(_, _) { can_download_code? }
       expose :upcoming_release?, as: :upcoming_release
-      expose :milestones, using: Entities::Milestone, if: -> (release, _) { release.milestones.present? && can_read_milestone? }
+      expose :milestones, using: Entities::MilestoneWithStats, if: -> (release, _) { release.milestones.present? && can_read_milestone? }
       expose :commit_path, expose_nil: false
       expose :tag_path, expose_nil: false
       expose :evidence_sha, expose_nil: false, if: ->(_, _) { can_download_code? }