diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-08-28 16:06:35 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-08-28 16:06:35 +0000 |
| commit | 6633ec816fd89a3b0937f8474c5c070e88960a94 (patch) | |
| tree | a1302918a4472746a9eeed9896fbf4d0c716266e | |
| parent | 018b0948defcc392aaf60101de775bd1e576d677 (diff) | |
| parent | 5049b4272e6d1d306a5ffcf05d8d190dacc58478 (diff) | |
| download | pleroma-6633ec816fd89a3b0937f8474c5c070e88960a94.tar.gz | |
Merge branch 'admin_fe_dont_list_mrf_policies_any_more' into 'develop'
Selecting MRF policies didn't work as intended any more
Closes admin-fe#198
See merge request pleroma/pleroma!3509
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf.ex | 2 | ||||
| -rw-r--r-- | test/pleroma/docs/generator_test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/activity_pub/mrf.ex b/lib/pleroma/web/activity_pub/mrf.ex index 23ea039c3..e4ee8fe82 100644 --- a/lib/pleroma/web/activity_pub/mrf.ex +++ b/lib/pleroma/web/activity_pub/mrf.ex @@ -21,7 +21,7 @@ defmodule Pleroma.Web.ActivityPub.MRF do type: [:module, {:list, :module}], description: "A list of MRF policies enabled. Module names are shortened (removed leading `Pleroma.Web.ActivityPub.MRF.` part), but on adding custom module you need to use full name.", - suggestions: {:list_behaviour_implementations, Pleroma.Web.ActivityPub.MRF} + suggestions: {:list_behaviour_implementations, Pleroma.Web.ActivityPub.MRF.Policy} }, %{ key: :transparency, diff --git a/test/pleroma/docs/generator_test.exs b/test/pleroma/docs/generator_test.exs index a9b09e577..8574c1d5e 100644 --- a/test/pleroma/docs/generator_test.exs +++ b/test/pleroma/docs/generator_test.exs @@ -23,7 +23,7 @@ defmodule Pleroma.Docs.GeneratorTest do key: :filters, type: {:list, :module}, description: "", - suggestions: {:list_behaviour_implementations, Pleroma.Web.ActivityPub.MRF} + suggestions: {:list_behaviour_implementations, Pleroma.Web.ActivityPub.MRF.Policy} }, %{ key: Pleroma.Upload, |