From b8430dddbd413c87f77ba7f02d9b0a0cd4ec42ad Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Thu, 22 Jun 2017 16:25:56 +0900
Subject: [PATCH] Change milestone endpoint for groups

---
 app/helpers/milestones_helper.rb                              | 2 ++
 .../unreleased/34116-milestone-filtering-on-group-issues.yml  | 4 ++++
 2 files changed, 6 insertions(+)
 create mode 100644 changelogs/unreleased/34116-milestone-filtering-on-group-issues.yml

diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
index a230db22fa2..f346e20e807 100644
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -74,6 +74,8 @@ module MilestonesHelper
     project = @target_project || @project
     if project
       namespace_project_milestones_path(project.namespace, project, :json)
+    elsif @group
+      group_milestones_path(@group, :json)
     else
       dashboard_milestones_path(:json)
     end
diff --git a/changelogs/unreleased/34116-milestone-filtering-on-group-issues.yml b/changelogs/unreleased/34116-milestone-filtering-on-group-issues.yml
new file mode 100644
index 00000000000..8f8b5a96c2b
--- /dev/null
+++ b/changelogs/unreleased/34116-milestone-filtering-on-group-issues.yml
@@ -0,0 +1,4 @@
+---
+title: Change milestone endpoint for groups
+merge_request: 12374
+author: Takuya Noguchi
-- 
2.30.9