diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-09 11:25:26 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-09 11:25:26 +0000 |
| commit | 2368ffd9efb9ae6f56266ca7dbacc0772701a6a7 (patch) | |
| tree | 5a9801b81808b554f20b0b028e497d9384d63d88 /app/controllers/dashboard | |
| parent | e80df8f234a26271c77358c36662b957b23cbcaf (diff) | |
| parent | c0c82368da57caac07f25227dac74d9c119b806e (diff) | |
| download | gitlab-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/dashboard')
| -rw-r--r-- | app/controllers/dashboard/milestones_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
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| |