Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'

Create tombstone instead of object deletion

See merge request pleroma/pleroma!593

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

diff --cc lib/pleroma/object.ex
index cc4a2181a060c5d5c9e965bce9b4cebd34b5e4fc,5b1347b37251fec130ac21ac68fa6c1eb9b263f1..e2b64872785dfca64084526243028e235951d97d
--- 1/lib/pleroma/object.ex
--- 2/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@@ -1,10 -1,6 +1,10 @@@
 +# Pleroma: A lightweight social networking server
 +# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
 +# SPDX-License-Identifier: AGPL-3.0-only
 +
  defmodule Pleroma.Object do
    use Ecto.Schema
-   alias Pleroma.{Repo, Object, User, Activity}
+   alias Pleroma.{Repo, Object, User, Activity, ObjectTombstone}
    import Ecto.{Query, Changeset}
  
    schema "objects" do

diff --cc test/activity_test.exs
index cf27fbbc50bf4e054675ee210c6136d709b3761a,ddcf548030327dcd169ce7675f8f11f8375dbc9d..36c718869cc5acde56ac301ec69066faba1e2bff
--- 1/test/activity_test.exs
--- 2/test/activity_test.exs
+++ b/test/activity_test.exs
@@@ -1,9 -1,6 +1,10 @@@
 +# Pleroma: A lightweight social networking server
 +# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
 +# SPDX-License-Identifier: AGPL-3.0-only
 +
  defmodule Pleroma.ActivityTest do
    use Pleroma.DataCase
+   alias Pleroma.Activity
    import Pleroma.Factory
  
    test "returns an activity by it's AP id" do

diff --cc test/object_test.exs
Simple merge

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

diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge

diff --cc test/web/ostatus/ostatus_controller_test.exs
Simple merge