Updated controller with before_action

Fixed other issues based on feedback

2 files changed, 5 insertions, 7 deletions

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 614e28b6dce..36986d9a18d 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -3,7 +3,7 @@ class DashboardController < Dashboard::ApplicationController
   include MergeRequestsAction
 
   before_action :event_filter, only: :activity
-  before_action :projects, only: [:issues, :merge_requests]
+  before_action :projects, only: [:issues, :merge_requests, :labels, :milestones]
 
   respond_to :html
 
@@ -23,7 +23,6 @@ class DashboardController < Dashboard::ApplicationController
   def labels
     respond_to do |format|
       format.json do
-        projects
         render json: view_context.projects_labels_options
       end
     end
@@ -32,7 +31,6 @@ class DashboardController < Dashboard::ApplicationController
   def milestones
     respond_to do |format|
       format.json do
-        projects
         render json: view_context.projects_milestones_options
       end
     end
diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb
index cfb0435717e..7b70f5fa7d7 100644
--- a/app/controllers/projects/milestones_controller.rb
+++ b/app/controllers/projects/milestones_controller.rb
@@ -19,13 +19,13 @@ class Projects::MilestonesController < Projects::ApplicationController
       end
 
     @milestones = @milestones.includes(:project)
-    @milestones_all = @milestones
-    @milestones = @milestones.page(params[:page]).per(PER_PAGE)
 
     respond_to do |format|
-      format.html
+      format.html do
+        @milestones = @milestones.page(params[:page]).per(PER_PAGE)
+      end
       format.json do
-        render json: @milestones_all.to_json
+        render json: @milestones_all
       end
     end
   end