summaryrefslogtreecommitdiff
path: root/app/controllers/dashboard/application_controller.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-03-23 11:40:10 +0000
committerRémy Coutable <remy@rymai.me>2016-03-23 12:48:08 +0100
commite257e81cbfd79fcc019e668c31a6bd406c485674 (patch)
tree8f5dfc4919e5f9064e1889135aa221c6b87f47ff /app/controllers/dashboard/application_controller.rb
parente1f999a2cad3fc93ef25a5bc8c2c79c9cb140dbb (diff)
downloadgitlab-ce-e257e81cbfd79fcc019e668c31a6bd406c485674.tar.gz
Merge branch 'fix/14505' into 'master'
Fix an issue causing the Dashboard/Milestones page to be blank Fixes #14505 and #14514. See merge request !3348
Diffstat (limited to 'app/controllers/dashboard/application_controller.rb')
-rw-r--r--app/controllers/dashboard/application_controller.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/dashboard/application_controller.rb b/app/controllers/dashboard/application_controller.rb
index 962ea38d6c9..9d3d1c23c28 100644
--- a/app/controllers/dashboard/application_controller.rb
+++ b/app/controllers/dashboard/application_controller.rb
@@ -1,3 +1,9 @@
class Dashboard::ApplicationController < ApplicationController
layout 'dashboard'
+
+ private
+
+ def projects
+ @projects ||= current_user.authorized_projects.sorted_by_activity.non_archived
+ end
end