diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-07-06 18:25:54 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-07-06 19:55:05 +0300 |
commit | 98090639d302d30ea1422512a35a74e8600fa2e7 (patch) | |
tree | 08cfea6ed2b5bb3d74b21b48e9c318d93f603624 /CHANGELOG | |
parent | 3dee2366bf32413486a116247f04ca7c7aca1430 (diff) |
Merge branch '19092-fix-event-for-legacydiffnote-not-considered-note' into 'master'
Fix diff comments not showing up in activity feed
## What does this MR do?
It fixes the detection of note events to check for `Note` and `LegacyDiffNote`.
## Are there points in the code the reviewer needs to double check?
No? /cc @DouweM (since I believe you introduced `LegacyDiffNote`
## Why was this MR needed?
To fix #19092.
## What are the relevant issue numbers?
Fixes #19092.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5069
(cherry picked from commit b5b17d00eddef8011e3a71d5f4ad46c6d40cbf8a)
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2056b5e7b36..545a9f66b98 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.9.5 + - Fix diff comments not showing up in activity feed. !5069 - Add index on both Award Emoji user and name. !5061 - Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq. !5056 - Re-enable import button when import process fails due to namespace already being taken. !5053 |