From 5ce7db455c95c0ef5fbf2eb76b7d8025d44111cd Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Fri, 23 Dec 2022 17:06:44 +0100 Subject: [PATCH] Git merge is not my favorite tool --- CHANGELOG.md | 14 -------------- .../article_note_page_validator_test.exs | 13 ------------- 2 files changed, 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54f564139..3da8baf43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -64,20 +64,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Removed - Quack, the logging backend that pushes to Slack channels -## 2.4.5 - 2022-08-27 - -## Fixed -- Image `class` attributes not being scrubbed, allowing to exploit frontend special classes [!3792](https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3792) -- Delete report notifs when demoting from superuser [!3642](https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3642) -- Validate `mediaType` only by it's format rather than using a list [!3597](https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3597) -- Pagination: Make mutes and blocks lists behave the same as other lists [!3693](https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3693) -- Compatibility with Elixir 1.14 [!3740](https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3740) -- Frontend installer: FediFE build URL [!3736](https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3736) -- Streaming: Don't stream ChatMessage into the home timeline [!3738](https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3738) -- Streaming: Stream local-only posts in the local timeline [!3738](https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3738) -- Signatures: Fix `keyId` lookup for GoToSocial [!3725](https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3725) -- Validator: Fix `replies` handling for GoToSocial [!3725](https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3725) - ## 2.4.5 - 2022-11-27 ## Fixed diff --git a/test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs b/test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs index 38ea6f1d0..c7a62be18 100644 --- a/test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs +++ b/test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs @@ -116,17 +116,4 @@ test "a Note without replies/first/items validates" do %{valid?: true} = ArticleNotePageValidator.cast_and_validate(note) end - - test "a Note without replies/first/items validates" do - insert(:user, ap_id: "https://mastodon.social/users/emelie") - - note = - "test/fixtures/tesla_mock/status.emelie.json" - |> File.read!() - |> Jason.decode!() - |> pop_in(["replies", "first", "items"]) - |> elem(1) - - %{valid?: true} = ArticleNotePageValidator.cast_and_validate(note) - end end