Merge branch 'develop' into rename/pleroma_activity_consistency

2019-01-23 13:05:58 +01:00 · 2019-01-23 13:05:58 +01:00 · 2de208817c
commit 2de208817c
parent 7390192c03 b624b7a150
17 changed files with 324 additions and 20 deletions
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@ -36,6 +36,10 @@ defmodule Pleroma.Activity do
    )
  end

+  def get_by_id(id) do
+    Repo.get(Activity, id)
+  end
+
  def by_object_ap_id(ap_id) do
    from(
      activity in Activity,