From: kaniini <nenolod@gmail.com>
Date: Thu, 27 Dec 2018 19:37:55 +0000 (+0000)
Subject: Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=bee6acd51dc4e84e44caecf9d123dfff2f640a38;p=akkoma

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

Create tombstone instead of object deletion

See merge request pleroma/pleroma!593
---

bee6acd51dc4e84e44caecf9d123dfff2f640a38
diff --cc lib/pleroma/object.ex
index cc4a2181a,5b1347b37..e2b648727
--- a/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 cf27fbbc5,ddcf54803..36c718869
--- a/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