Merge branch 'fork' into backend-new

Merge remote-tracking branch 'origin/develop' into fork
Signed-off-by: mkljczk <git@mkljczk.pl>
2024-12-06 20:30:44 +01:00 · 2024-12-06 20:30:32 +01:00 · 2024-12-06 20:30:07 +01:00 · 2024-11-27 14:48:53 +00:00 · 2024-11-27 17:55:33 +09:00 · 2024-11-27 08:09:51 +00:00
9 changed files with 18 additions and 9 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.

 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

+## 2.7.1
+
+### Changed
+- Accept `application/activity+json` for requests to `/.well-known/nodeinfo`
+
+### Fixed
+- Truncate remote user fields, avoids them getting rejected
+- Improve the `FollowValidator` to successfully incoming activities with an errant `cc` field.
+- Resolved edge case where the API can report you are following a user but the relationship is not fully established.
+- The Swoosh email adapter for Mailgun was missing a new dependency on `:multipart`
+- Fix Mastodon WebSocket authentication
+
 ## 2.7.0

 ### Security
--- a/changelog.d/bugfix-truncate-remote-user-fields.fix
+++ b/changelog.d/bugfix-truncate-remote-user-fields.fix
@ -1 +0,0 @@
-Truncate remote user fields, avoids them getting rejected
--- a/changelog.d/follow-validator.fix
+++ b/changelog.d/follow-validator.fix
@ -1 +0,0 @@
-Improve the FollowValidator to successfully incoming activities with an errant cc field.
--- a/changelog.d/following-state.fix
+++ b/changelog.d/following-state.fix
@ -1 +0,0 @@
-Resolved edge case where the API can report you are following a user but the relationship is not fully established.
--- a/changelog.d/mailgun.fix
+++ b/changelog.d/mailgun.fix
@ -1 +0,0 @@
-The Swoosh email adapter for Mailgun was missing a new dependency on :multipart
--- a/changelog.d/mastodon-websocket.fix
+++ b/changelog.d/mastodon-websocket.fix
@ -1 +0,0 @@
-Fix Mastodon WebSocket authentication
--- a/changelog.d/well-known.change
+++ b/changelog.d/well-known.change
@ -1 +0,0 @@
-Accept application/activity+json for requests to .well-known/nodeinfo
--- a/lib/pleroma/frontend.ex
+++ b/lib/pleroma/frontend.ex
@ -110,11 +110,14 @@ def unzip(zip, dest) do

        new_file_path = Path.join(dest, path)

-        new_file_path
+        path
        |> Path.dirname()
+        |> then(&Path.join(dest, &1))
        |> File.mkdir_p!()

-        File.write!(new_file_path, data)
+        if not File.dir?(new_file_path) do
+          File.write!(new_file_path, data)
+        end
      end)
    end
  end
--- a/mix.exs
+++ b/mix.exs
@ -8,7 +8,7 @@ def project do
      app: :pleroma,
      name: "pl",
      compat_name: "Pleroma",
-      version: version("2.7.0"),
+      version: version("2.7.51"),
      elixir: "~> 1.14",
      elixirc_paths: elixirc_paths(Mix.env()),
      compilers: Mix.compilers(),
Author	SHA1	Message	Date
mkljczk	2ec404eca4	Merge branch 'fork' into backend-new	2024-12-06 20:30:44 +01:00
mkljczk	b38501ef92	Merge remote-tracking branch 'origin/develop' into fork Signed-off-by: mkljczk <git@mkljczk.pl>	2024-12-06 20:30:32 +01:00
mkljczk	74b384968f	fix typos Signed-off-by: mkljczk <git@mkljczk.pl>	2024-12-06 20:30:07 +01:00
Haelwenn	16027b769c	Merge branch 'fix/install-frontend-in-otp27' into 'develop' Fix installing frontend in Erlang/OTP 27.1+ See merge request pleroma/pleroma!4300	2024-11-27 14:48:53 +00:00
kPherox	3f98c8bd1b	fix: skip directory entries In OTP 27.1 or later, `:zip.unzip/2` without `:skip_directories` option returns directory entries. However in OTP 26, passing `:skip_directories` returns a `:bad_option` error, so this option is not available for compatibility.	2024-11-27 17:55:33 +09:00
lain	36f8b924ae	Merge branch 'mergeback/2.7.1' into 'develop' mergeback: Version 2.7.1 See merge request pleroma/pleroma!4299	2024-11-27 08:09:51 +00:00
Haelwenn (lanodan) Monnier	3a8e24fed4	Merge remote-tracking branch 'pleroma/stable' into mergeback/2.7.1	2024-11-26 16:46:47 +01:00
Haelwenn	31487e5be4	Merge branch 'release/2.7.1' into 'stable' Version 2.7.1 See merge request pleroma/pleroma!4298	2024-11-26 13:38:35 +00:00
Haelwenn (lanodan) Monnier	7bb2dccc05	Version 2.7.1	2024-11-26 14:09:09 +01:00
feld	6a0883e5d3	Merge branch 'bugfix-truncate-remote-user-fields' into 'develop' User: truncate remote user fields instead of rejecting See merge request pleroma/pleroma!4220	2024-11-26 14:06:49 +01:00
lain	53c2d2cd87	Merge branch 'mastodon-websocket-fix' into 'develop' Fix Mastodon WebSocket authentication See merge request pleroma/pleroma!4206	2024-11-26 14:06:31 +01:00
lain	f45f17b5ff	Merge branch 'follow-validator' into 'develop' Do not require a cc field when validating an incoming Follow activity See merge request pleroma/pleroma!4212	2024-11-26 14:04:45 +01:00
feld	a6e97c497b	Merge branch 'following-state-bug' into 'develop' Fix Following status bug See merge request pleroma/pleroma!4251	2024-11-26 14:04:21 +01:00
feld	2977779e94	Merge branch 'well-known' into 'develop' NodeInfo: Accept application/activity+json requests See merge request pleroma/pleroma!4242	2024-11-26 14:03:18 +01:00
feld	ced6b10c70	Merge branch 'swoosh-mailgun' into 'develop' Fix Swoosh Mailgun support See merge request pleroma/pleroma!4217	2024-11-26 13:58:48 +01:00
				`@ -1 +0,0 @@`
				`Truncate remote user fields, avoids them getting rejected`
				`@ -1 +0,0 @@`
				`Improve the FollowValidator to successfully incoming activities with an errant cc field.`
				`@ -1 +0,0 @@`
				`Resolved edge case where the API can report you are following a user but the relationship is not fully established.`
				`@ -1 +0,0 @@`
				`The Swoosh email adapter for Mailgun was missing a new dependency on :multipart`
				`@ -1 +0,0 @@`
				`Accept application/activity+json for requests to .well-known/nodeinfo`