summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <tak.noguchi.iridge@gmail.com>2017-06-22 16:25:56 +0900
committerTakuya Noguchi <tak.noguchi.iridge@gmail.com>2017-06-27 00:15:51 +0900
commitb8430dddbd413c87f77ba7f02d9b0a0cd4ec42ad (patch)
tree6324e8bfc18c434aec41c9af5fb98e76063c666f
parentbd874729a2110e1270d09338bb326110c880e001 (diff)
downloadgitlab-ce-b8430dddbd413c87f77ba7f02d9b0a0cd4ec42ad.tar.gz
Change milestone endpoint for groups
-rw-r--r--app/helpers/milestones_helper.rb2
-rw-r--r--changelogs/unreleased/34116-milestone-filtering-on-group-issues.yml4
2 files changed, 6 insertions, 0 deletions
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