diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-17 09:09:06 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-18 15:18:06 +0000 |
| commit | 0eecc214853fc07b9237b50ab65a6c702cbfaeb4 (patch) | |
| tree | 1fa57614a896f042a0365d5d08429d81e37105e3 /app/controllers/dashboard_controller.rb | |
| parent | d847db79cb6a99d9cfb6f4c57587887942965388 (diff) | |
| download | gitlab-ce-0eecc214853fc07b9237b50ab65a6c702cbfaeb4.tar.gz | |
Updated controller with before_action
Fixed other issues based on feedback
Diffstat (limited to 'app/controllers/dashboard_controller.rb')
| -rw-r--r-- | app/controllers/dashboard_controller.rb | 4 |
1 files changed, 1 insertions, 3 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 |