diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-07-06 18:25:54 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-07-06 18:25:54 +0300 |
commit | b5b17d00eddef8011e3a71d5f4ad46c6d40cbf8a (patch) | |
tree | e1fe97b1c34be156f1b29a0013273f886c859a83 /CHANGELOG | |
parent | 0742b65203019cd1164bc8eb7c357439861d91b6 (diff) | |
parent | 19e15ae244776d4d148e6a65a1443f94bb59398c (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
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 40bccaabb39..1083773b009 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -52,6 +52,7 @@ v 8.9.5 (unreleased) - Add index on the user and emoji name on AwardEmoji table !5061 - Fixes issues importing events in Import/Export. Import/Export version bumped to 0.1.1 - Fix import button disabled when import process fail due to the namespace already been taken. + - Fix diff comments not showing up in activity feed. !5069 - Security: Update RedCloth to 4.3.2 (Takuya Noguchi) v 8.9.4 |