diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-03 12:33:41 +0000 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2016-06-14 22:14:16 +0200 |
| commit | a834be61eb3d5698fe298eabd8758ef0b861a332 (patch) | |
| tree | 3eb888a8635a5440f49a260bda06c2f8dd7357c1 /CHANGELOG | |
| parent | b240450845e5d8f6d0c1012f9df75efb79946d5e (diff) | |
| download | gitlab-ce-a834be61eb3d5698fe298eabd8758ef0b861a332.tar.gz | |
Merge branch 'todos-filter-project-delete' into 'master'
Ensure we don't show TODOS for projects pending delete
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.
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.
Todos page throws 500 error for users with todos in a project pending deletion.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17813
cc\ @stanhu
See merge request !4300
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 7a80af3bece..adab410f58c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.8.5 - Import GitHub repositories respecting the API rate limit + - Fix todos page throwing errors when you have a project pending deletion v 8.8.4 - Fix LDAP-based login for users with 2FA enabled. !4493 |