diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-03 11:17:55 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-03 11:17:55 +0000 |
| commit | 063b035d931d0676cf427fa8de49966360cbf42b (patch) | |
| tree | 2b47a0aac0196a7fdbba66b716b7bb76f7d4a675 /app/helpers | |
| parent | 2443ab69206f7cbd9a6ac2e96308695a01b85c7a (diff) | |
| parent | b8430dddbd413c87f77ba7f02d9b0a0cd4ec42ad (diff) | |
| download | gitlab-ce-063b035d931d0676cf427fa8de49966360cbf42b.tar.gz | |
Merge branch '34116-milestone-filtering-on-group-issues' into 'master'
Use correct milestones for filtering on Group Issues
Closes #34116
See merge request !12374
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/milestones_helper.rb | 2 |
1 files changed, 2 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 |