kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/models
History
Douwe Maan b5b17d00ed 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
2016-07-06 15:25:54 +00:00
..
ci Explicitly set to nil when artifacts don't exist: 2016-07-04 22:56:23 +08:00
concerns Merge branch 'master' into dev-master 2016-07-02 22:58:21 +02:00
hooks Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
members Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
network Enable Style/SpaceAfterComma Rubocop cop 2016-06-29 15:23:44 +02:00
project_services Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
.gitkeep
ability.rb Add a migration to remove requesters that are owners of their project 2016-07-05 18:55:35 +02:00
abuse_report.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
appearance.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
application_setting.rb Rename enabled_git_access_protocols to singular. 2016-07-05 16:54:22 -05:00
audit_event.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
award_emoji.rb Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem. 2016-06-29 14:53:09 -06:00
blob.rb Revert "squashed merge and fixed conflicts" 2016-06-16 12:59:07 +02:00
broadcast_message.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
commit.rb Optimize Banzai::Filter::RelativeLinkFilter 2016-06-21 10:53:16 -04:00
commit_range.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
commit_status.rb Rename commit_data in Pipeline to commit 2016-06-21 14:43:37 +02:00
deploy_key.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
deploy_keys_project.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
deployment.rb Revert "squashed merge and fixed conflicts" 2016-06-16 12:59:07 +02:00
email.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
environment.rb Revert "squashed merge and fixed conflicts" 2016-06-16 12:59:07 +02:00
event.rb Use a more future-proof check for Note/LegacyDiffNote 2016-07-06 10:08:42 +02:00
external_issue.rb Merge branch 'master' into number_sign_for_external_issue_ref 2016-04-17 18:17:27 +02:00
forked_project_link.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
generic_commit_status.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
global_label.rb Updates from last code review. 2016-03-06 23:07:19 -05:00
global_milestone.rb Ruby fixes 2016-03-29 12:19:09 +01:00
group.rb Dumb-down avatar presence check in avatar_url methods 2016-07-05 10:51:11 -04:00
identity.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
issue.rb use has_many relationship with events 2016-07-01 15:34:10 +02:00
key.rb Remove Duplicated keys add UNIQUE index to fingerprint 2016-06-20 13:29:04 +02:00
label.rb Use CGI.unescapeHTML rather than doing the gsub with a map 2016-07-05 20:57:09 -03:00
label_link.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
legacy_diff_note.rb Restore old behavior around diff notes to outdated discussions 2016-06-22 22:09:11 -04:00
lfs_object.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
lfs_objects_project.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
member.rb Exclude requesters from Project#members, Group#members and User#members 2016-07-01 17:44:46 +02:00
merge_request.rb Revert back to not defining a default Git access protocol. 2016-07-05 16:54:22 -05:00
merge_request_diff.rb Don't garbage collect commits that have related DB records like comments 2016-07-04 00:11:33 -04:00
milestone.rb use has_many relationship with events 2016-07-01 15:34:10 +02:00
namespace.rb Refactor repository paths handling to allow multiple git mount points 2016-06-29 22:30:31 -04:00
note.rb Don't garbage collect commits that have related DB records like comments 2016-07-04 00:11:33 -04:00
notification_setting.rb Revert "squashed merge and fixed conflicts" 2016-06-16 12:59:07 +02:00
oauth_access_token.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
personal_access_token.rb Address @DouweM's feedback on !3749. 2016-04-28 22:28:36 +05:30
personal_snippet.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
project.rb Merge branch 'fix/import-url-validator' into 'master' 2016-07-06 15:06:01 +00:00
project_group_link.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
project_import_data.rb add missing attribute to attr_encrypted so it is fully backwards-compatible 2016-06-28 09:55:19 +02:00
project_snippet.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
project_team.rb Exclude requesters from Project#members, Group#members and User#members 2016-07-01 17:44:46 +02:00
project_wiki.rb Refactor repository paths handling to allow multiple git mount points 2016-06-29 22:30:31 -04:00
protected_branch.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
release.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
repository.rb Document Repository#keep_around 2016-07-04 00:11:33 -04:00
security_event.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
sent_notification.rb Don't garbage collect commits that have related DB records like comments 2016-07-04 00:11:33 -04:00
service.rb Added Bugzilla as external issue tracker option 2016-06-29 06:01:54 -04:00
snippet.rb Merge branch 'feature/custom-highlighting' into 'master' 2016-06-28 08:42:42 +00:00
spam_log.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
spam_report.rb
subscription.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
todo.rb Don't garbage collect commits that have related DB records like comments 2016-07-04 00:11:33 -04:00
tree.rb
u2f_registration.rb Add a U2fRegistrations table/model. 2016-06-06 12:50:31 +05:30
user.rb Dumb-down avatar presence check in avatar_url methods 2016-07-05 10:51:11 -04:00
users_star_project.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
wiki_page.rb add slack notifications for wiki pages 2016-04-20 08:25:40 +08:00