diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-16 19:14:31 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-18 15:18:06 +0000 |
| commit | d847db79cb6a99d9cfb6f4c57587887942965388 (patch) | |
| tree | eab21bec8ff4667ea931e438e7d66a346e62659d /app/controllers | |
| parent | 645b7a0a3389dca3a709f65a52ae765f213078f2 (diff) | |
| download | gitlab-ce-d847db79cb6a99d9cfb6f4c57587887942965388.tar.gz | |
Fixes issue on dashboard issues
They would try to load JSON from a project even though it isn't a single project
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/dashboard_controller.rb | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 139e40db180..614e28b6dce 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -20,6 +20,24 @@ class DashboardController < Dashboard::ApplicationController end end + def labels + respond_to do |format| + format.json do + projects + render json: view_context.projects_labels_options + end + end + end + + def milestones + respond_to do |format| + format.json do + projects + render json: view_context.projects_milestones_options + end + end + end + protected def load_events |