Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11

diff --cc config/config.exs
Simple merge

diff --cc lib/pleroma/application.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/activity_pub_controller.ex
Simple merge

diff --cc mix.exs
Simple merge

diff --cc mix.lock
Simple merge

diff --cc test/pleroma/notification_test.exs
index ac43096fb21ad62bdbc15e77e8b1904d86a0da0f,0e9630f28518297f7a9be155d169a007debd0362..a74fb7bc2cc86812792ff5ba7360775a52d0a7a8
--- 1/test/pleroma/notification_test.exs
--- 2/test/pleroma/notification_test.exs
+++ b/test/pleroma/notification_test.exs
@@@ -397,10 -397,10 +397,10 @@@ defmodule Pleroma.NotificationTest d
      end
  
      test "dismisses the notification on follow request rejection" do
-       user = insert(:user, locked: true)
+       user = insert(:user, is_locked: true)
        follower = insert(:user)
        {:ok, _, _, _follow_activity} = CommonAPI.follow(follower, user)
 -      assert [notification] = Notification.for_user(user)
 +      assert [_notification] = Notification.for_user(user)
        {:ok, _follower} = CommonAPI.reject_follow_request(follower, user)
        assert [] = Notification.for_user(user)
      end

diff --cc test/pleroma/web/activity_pub/activity_pub_test.exs
Simple merge

diff --cc test/pleroma/web/common_api_test.exs
Simple merge

diff --cc test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
Simple merge

diff --cc test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
Simple merge

diff --cc test/pleroma/web/pleroma_api/controllers/mascot_controller_test.exs
Simple merge