summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-06-09 11:25:26 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-06-09 11:25:26 +0000
commit2368ffd9efb9ae6f56266ca7dbacc0772701a6a7 (patch)
tree5a9801b81808b554f20b0b028e497d9384d63d88 /app/controllers/concerns
parente80df8f234a26271c77358c36662b957b23cbcaf (diff)
parentc0c82368da57caac07f25227dac74d9c119b806e (diff)
downloadgitlab-ce-2368ffd9efb9ae6f56266ca7dbacc0772701a6a7.tar.gz
Merge branch 'dashboard-milestone-tabs-loading-async' into 'master'
Fixed dashboard milestone tabs not loading Closes #33477 See merge request !12023
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r--app/controllers/concerns/milestone_actions.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/concerns/milestone_actions.rb b/app/controllers/concerns/milestone_actions.rb
index 3e2a0fe4f8b..b2536a1c949 100644
--- a/app/controllers/concerns/milestone_actions.rb
+++ b/app/controllers/concerns/milestone_actions.rb
@@ -46,8 +46,10 @@ module MilestoneActions
def milestone_redirect_path
if @project
namespace_project_milestone_path(@project.namespace, @project, @milestone)
- else
+ elsif @group
group_milestone_path(@group, @milestone.safe_title, title: @milestone.title)
+ else
+ dashboard_milestone_path(@milestone.safe_title, title: @milestone.title)
end
end
end