Merge branch 'develop' of https://akkoma.dev/AkkomaGang/akkoma into akko.wtf

CHANGELOG.md

@@ -4,7 +4,7 @@ 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/).
 
-## UNRELEASED
+## 2025.01
 
 ## Added
 - New config option `:instance, :cleanup_attachments_delay`

mix.exs

@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("3.13.3"),
+      version: version("3.14.0"),
       elixir: "~> 1.14",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: Mix.compilers(),

test/pleroma/web/mastodon_api/views/status_view_test.exs

@@ -588,6 +588,7 @@ test "attachments" do
   end
 
   test "put the url advertised in the Activity in to the url attribute" do
+    Pleroma.Config.put([:instance, :limit_to_local_content], false)
     id = "https://wedistribute.org/wp-json/pterotype/v1/object/85810"
     [activity] = Activity.search(nil, id)