Merge branch and resolve conflict in database_test.exs

2025-02-25 16:23:46 +04:00 · 2025-02-25 16:23:46 +04:00 · 5851d787b6
commit 5851d787b6
parent bee027e511 6f48ade417
42 changed files with 1181 additions and 41 deletions
--- a/test/mix/tasks/pleroma/database_test.exs
+++ b/test/mix/tasks/pleroma/database_test.exs
@ -412,6 +412,7 @@ defmodule Mix.Tasks.Pleroma.DatabaseTest do
               ["schema_migrations"],
               ["thread_mutes"],
               ["user_follows_hashtag"],
+               # ["user_frontend_setting_profiles"],        # not in pleroma
               ["user_invite_tokens"],
               ["user_notes"],
               ["user_relationships"],