diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-08 17:43:05 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-09 09:57:42 +0100 |
| commit | c0c82368da57caac07f25227dac74d9c119b806e (patch) | |
| tree | 37e83b3b2f40553a1be1aaf3d1e13ddaa39135d3 /app/controllers | |
| parent | fd072e2221147f52edf74d4dcedb2ffa3799ab2f (diff) | |
| download | gitlab-ce-c0c82368da57caac07f25227dac74d9c119b806e.tar.gz | |
Fixed dashboard milestone tabs not loadingdashboard-milestone-tabs-loading-async
Closes #33477
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/milestone_actions.rb | 4 | ||||
| -rw-r--r-- | app/controllers/dashboard/milestones_controller.rb | 4 |
2 files changed, 6 insertions, 2 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 diff --git a/app/controllers/dashboard/milestones_controller.rb b/app/controllers/dashboard/milestones_controller.rb index df528d10f6e..751dbbd8e96 100644 --- a/app/controllers/dashboard/milestones_controller.rb +++ b/app/controllers/dashboard/milestones_controller.rb @@ -1,6 +1,8 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController + include MilestoneActions + before_action :projects - before_action :milestone, only: [:show] + before_action :milestone, only: [:show, :merge_requests, :participants, :labels] def index respond_to do |format| |