diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-26 11:29:38 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-26 11:29:38 +0300 |
| commit | f2da36f19661353cd1bd6788fbdf1a65e2d70f8d (patch) | |
| tree | a258b53b7c3866a4994d8d416369465919f467e9 /app | |
| parent | 695f5085a1ff4be571540c3201e26060b46ec522 (diff) | |
| parent | 22d53f06076e52165af3ba04d0b703bed20cfb97 (diff) | |
Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' into 'master'
Fixes 500 error caused by pending delete projects in admin dashboard
Closes #35453
See merge request !13067
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/admin/dashboard_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb index 8360ce08bdc..05e749c00c0 100644 --- a/app/controllers/admin/dashboard_controller.rb +++ b/app/controllers/admin/dashboard_controller.rb @@ -1,6 +1,6 @@ class Admin::DashboardController < Admin::ApplicationController def index - @projects = Project.with_route.limit(10) + @projects = Project.without_deleted.with_route.limit(10) @users = User.limit(10) @groups = Group.with_route.limit(10) end |