Merge remote-tracking branch 'origin/develop' into merge-pleroma

.gitlab-ci.yml

@@ -142,6 +142,8 @@ docker:
   cache: {}
   services:
     - docker:20.10.17-dind
+  tags:
+    - dind
   # https://medium.com/devops-with-valentine/how-to-build-a-docker-image-and-push-it-to-the-gitlab-container-registry-from-a-gitlab-ci-pipeline-acac0d1f26df
   script:
     - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin

priv/repo/migrations/20220605185734_add_update_to_notifications_enum.exs

@@ -10,7 +10,7 @@ def up do
     |> execute()
   end
 
-  # 20210717000000_add_poll_to_notifications_enum.exs
+  # 20220319000000_add_status_to_notifications_enum.exs
   def down do
     alter table(:notifications) do
       modify(:type, :string)
@@ -37,7 +37,8 @@ def down do
       'reblog',
       'favourite',
       'pleroma:report',
-      'poll'
+      'poll',
+      'status'
     )
     """
     |> execute()

test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs

@@ -600,6 +600,7 @@ test "see notifications after muting user with notifications and with_muted para
     assert length(json_response_and_validate_schema(conn, 200)) == 1
   end
 
+  @tag :erratic
   test "see move notifications" do
     old_user = insert(:user)
     new_user = insert(:user, also_known_as: [old_user.ap_id])

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

@@ -144,6 +144,7 @@ test "Follow notification" do
     refute Repo.one(Notification)
   end
 
+  @tag :erratic
   test "Move notification" do
     old_user = insert(:user)
     new_user = insert(:user, also_known_as: [old_user.ap_id])