diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-06-03 12:33:41 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-06-03 12:33:41 +0000 |
commit | 704991252604fbc14eef72e2eb1c2ad4629a7616 (patch) | |
tree | 3d754a42746bb34cb35a4f7c3645d75e81508423 /CHANGELOG | |
parent | 1637e178b8bae13fb92456570e23243c7ddc7cba (diff) | |
parent | 86675194aa44236c3e9acc4aa7ede143f718685e (diff) | |
download | gitlab-ce-704991252604fbc14eef72e2eb1c2ad4629a7616.tar.gz |
Merge branch 'todos-filter-project-delete' into 'master'
Ensure we don't show TODOS for projects pending delete
## What does this MR do?
Joins the todos on the projects table in order to run the default scope. Also includes a where clause because the default scope is being removed soon.
## Are there points in the code the reviewer needs to double check?
An alternative approach, more like the Issues page, would be to filter down the list by passing user.authorized_projects into the where clause.
Or we could just be more defensive in the view when iterating.
## Why was this MR needed?
Todos page throws 500 error for users with todos in a project pending deletion.
## What are the relevant issue numbers?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17813
cc\ @stanhu
See merge request !4300
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index ec026b8f398..6e11626e389 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -34,6 +34,9 @@ v 8.9.0 (unreleased) - Improve error handling importing projects - Put project Files and Commits tabs under Code tab +v 8.8.4 + - Fix todos page throwing errors when you have a project pending deletion + v 8.8.3 - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312 - Fixed JS error when trying to remove discussion form. !4303 |