diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-01-28 15:12:24 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-01-28 15:12:24 +0100 |
| commit | b7ec476205173b9ca1780843ceb4617fdde0b9d7 (patch) | |
| tree | 85e3c3e5012eefc78b51823b1c45185df447b720 /app/controllers/dashboard_controller.rb | |
| parent | 30b0d06e9f74f0068926314ec03b003fbd86c8f2 (diff) | |
| parent | 9bf47f06ab69a1592cec87825aaaf5bb4adec464 (diff) | |
| download | gitlab-ce-mr-merge-base.tar.gz | |
Merge branch 'master' into mr-merge-basemr-merge-base
Diffstat (limited to 'app/controllers/dashboard_controller.rb')
| -rw-r--r-- | app/controllers/dashboard_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 087da935087..139e40db180 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -23,14 +23,14 @@ class DashboardController < Dashboard::ApplicationController protected def load_events - project_ids = + projects = if params[:filter] == "starred" current_user.starred_projects else current_user.authorized_projects - end.pluck(:id) + end - @events = Event.in_projects(project_ids) + @events = Event.in_projects(projects) @events = @event_filter.apply_filter(@events).with_associations @events = @events.limit(20).offset(params[:offset] || 0) end |