akkoma
5 years agoMerge branch 'feature/reverse-proxy' into 'develop'
kaniini [Fri, 30 Nov 2018 18:15:44 +0000 (18:15 +0000)]
Merge branch 'feature/reverse-proxy' into 'develop'

reverse proxy / uploads

See merge request pleroma/pleroma!470

5 years agoReverse proxy: default max read duration at 30 secs.
href [Fri, 30 Nov 2018 18:12:03 +0000 (19:12 +0100)]
Reverse proxy: default max read duration at 30 secs.

5 years agoMerge branch 'config-delete' into 'develop'
lambda [Fri, 30 Nov 2018 17:57:06 +0000 (17:57 +0000)]
Merge branch 'config-delete' into 'develop'

Add Pleroma.Config.delete/1

See merge request pleroma/pleroma!484

5 years agoMerge branch 'supervisor-order' into 'develop'
lambda [Fri, 30 Nov 2018 17:56:05 +0000 (17:56 +0000)]
Merge branch 'supervisor-order' into 'develop'

Fix supervisor order

See merge request pleroma/pleroma!485

5 years agoFix supervisor order
href [Mon, 19 Nov 2018 19:58:12 +0000 (20:58 +0100)]
Fix supervisor order

This starts `Pleroma.Web.Endpoint` after all other processes and may
avoid some weird bugs (especially at start/restart).

Also properly ignores starting the gopher's gen_server if disabled.

5 years agoPleroma.Config.delete/1
href [Fri, 30 Nov 2018 17:19:22 +0000 (18:19 +0100)]
Pleroma.Config.delete/1

5 years agoMIME: video/audio ogg detection
href [Fri, 30 Nov 2018 16:56:28 +0000 (17:56 +0100)]
MIME: video/audio ogg detection

5 years agoConfig docs
href [Fri, 30 Nov 2018 16:44:42 +0000 (17:44 +0100)]
Config docs

5 years agoUpload: bring back base_url
href [Fri, 30 Nov 2018 16:44:12 +0000 (17:44 +0100)]
Upload: bring back base_url

5 years agoFix deprecation warnings
href [Fri, 30 Nov 2018 10:35:10 +0000 (11:35 +0100)]
Fix deprecation warnings

5 years agoremove eal
href [Thu, 29 Nov 2018 20:37:32 +0000 (21:37 +0100)]
remove eal

i like you eal don't take it personally<3

5 years agoUploads fun, part. 2
href [Thu, 29 Nov 2018 20:11:45 +0000 (21:11 +0100)]
Uploads fun, part. 2

5 years agoreverse_proxy: more headers
href [Fri, 23 Nov 2018 22:59:24 +0000 (23:59 +0100)]
reverse_proxy: more headers

5 years agoParse correctly content-type & do not forward content-length
href [Fri, 23 Nov 2018 17:57:27 +0000 (18:57 +0100)]
Parse correctly content-type & do not forward content-length

5 years agoreverse proxy / uploads
href [Fri, 23 Nov 2018 16:40:45 +0000 (17:40 +0100)]
reverse proxy / uploads

5 years agoMerge branch 'bugfix/server-true-in-prod' into 'develop'
kaniini [Fri, 30 Nov 2018 04:36:20 +0000 (04:36 +0000)]
Merge branch 'bugfix/server-true-in-prod' into 'develop'

config/prod.exs: Remove server: true

See merge request pleroma/pleroma!483

5 years agoconfig/prod.exs: Remove server: true
Haelwenn (lanodan) Monnier [Fri, 30 Nov 2018 02:05:34 +0000 (03:05 +0100)]
config/prod.exs: Remove server: true

This breaks mix tasks in regular Elixir

5 years agoMerge branch 'enable-ci-cache' into 'develop'
lambda [Thu, 29 Nov 2018 09:34:46 +0000 (09:34 +0000)]
Merge branch 'enable-ci-cache' into 'develop'

[CI] Enable CI caching for _build and deps

See merge request pleroma/pleroma!482

5 years agoOnly jobs for one branch are allowed to use the same cache
rinpatch [Thu, 29 Nov 2018 09:20:47 +0000 (12:20 +0300)]
Only jobs for one branch are allowed to use the same cache

5 years agoCache _build
rinpatch [Thu, 29 Nov 2018 09:09:32 +0000 (12:09 +0300)]
Cache _build

5 years agoAdd dependency caching
rinpatch [Thu, 29 Nov 2018 08:45:14 +0000 (11:45 +0300)]
Add dependency caching

5 years agoMerge branch 'fix-list-stream-privacy' into 'develop'
lambda [Wed, 28 Nov 2018 21:10:20 +0000 (21:10 +0000)]
Merge branch 'fix-list-stream-privacy' into 'develop'

Streamer: Don't send unwanted DMs to list streams

See merge request pleroma/pleroma!478

5 years agoMerge branch 'revert-02e43d44' into 'develop'
kaniini [Tue, 27 Nov 2018 23:20:12 +0000 (23:20 +0000)]
Merge branch 'revert-02e43d44' into 'develop'

Revert "Merge branch 'chore/mix-lock-update' into 'develop'"

See merge request pleroma/pleroma!481

5 years agoRevert "Merge branch 'chore/mix-lock-update' into 'develop'"
kaniini [Tue, 27 Nov 2018 23:19:30 +0000 (23:19 +0000)]
Revert "Merge branch 'chore/mix-lock-update' into 'develop'"

This reverts merge request !480

5 years agoMerge branch 'chore/mix-lock-update' into 'develop'
kaniini [Tue, 27 Nov 2018 22:59:01 +0000 (22:59 +0000)]
Merge branch 'chore/mix-lock-update' into 'develop'

Add ex_doc & makeup_elixir to mix.lock

See merge request pleroma/pleroma!480

5 years agoAdd ex_doc & makeup_elixir to mix.lock
Maxim Filippov [Tue, 27 Nov 2018 22:12:06 +0000 (01:12 +0300)]
Add ex_doc & makeup_elixir to mix.lock

5 years agoStreamer: Don't send unwanted DMs to list streams
KokaKiwi [Tue, 27 Nov 2018 00:14:43 +0000 (01:14 +0100)]
Streamer: Don't send unwanted DMs to list streams

5 years agoMerge branch 'fix/version-string-force-git-abbrev-size' into 'develop'
kaniini [Tue, 27 Nov 2018 17:10:08 +0000 (17:10 +0000)]
Merge branch 'fix/version-string-force-git-abbrev-size' into 'develop'

fix: version string: force git abbrev size to 8 chars

Closes #389

See merge request pleroma/pleroma!472

5 years agoMerge branch 'ogg-theora-detection' into 'develop'
kaniini [Tue, 27 Nov 2018 16:55:56 +0000 (16:55 +0000)]
Merge branch 'ogg-theora-detection' into 'develop'

Add Theora detection to upload.ex

See merge request pleroma/pleroma!479

5 years ago Fix lint error
rinpatch [Tue, 27 Nov 2018 16:07:58 +0000 (19:07 +0300)]
 Fix lint error

5 years agoAdd Theora detection to upload.ex
rinpatch [Tue, 27 Nov 2018 11:34:29 +0000 (14:34 +0300)]
Add Theora detection to upload.ex

5 years agoMerge branch 'feature/mrf-user-allowlist' into 'develop'
Haelwenn [Tue, 27 Nov 2018 00:12:03 +0000 (00:12 +0000)]
Merge branch 'feature/mrf-user-allowlist' into 'develop'

MRF: user allowlist module

See merge request pleroma/pleroma!477

5 years agoMerge branch 'fix/pleromafe-title' into 'develop'
kaniini [Mon, 26 Nov 2018 23:59:30 +0000 (23:59 +0000)]
Merge branch 'fix/pleromafe-title' into 'develop'

Replace hardcoded <title>

See merge request pleroma/pleroma!476

5 years agoconfig: document mrf_user_allowlist
William Pitcock [Mon, 26 Nov 2018 23:54:46 +0000 (23:54 +0000)]
config: document mrf_user_allowlist

5 years agonodeinfo: add mrf_user_allowlist data
William Pitcock [Mon, 26 Nov 2018 23:42:24 +0000 (23:42 +0000)]
nodeinfo: add mrf_user_allowlist data

5 years agoMRF: add user allowlist module
William Pitcock [Mon, 26 Nov 2018 23:23:43 +0000 (23:23 +0000)]
MRF: add user allowlist module

5 years agoReplace this hardcoded <title>
Mark Felder [Mon, 26 Nov 2018 22:51:25 +0000 (22:51 +0000)]
Replace this hardcoded <title>

5 years agoMerge branch 'bugfix/csp-no-https' into 'develop'
kaniini [Mon, 26 Nov 2018 22:24:21 +0000 (22:24 +0000)]
Merge branch 'bugfix/csp-no-https' into 'develop'

Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https

See merge request pleroma/pleroma!475

5 years agoPlugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https
Haelwenn (lanodan) Monnier [Mon, 26 Nov 2018 20:40:29 +0000 (21:40 +0100)]
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https

This fixes running mastofe with MIX_ENV=dev

5 years agoMerge branch 'add-manifest-src-to-csp' into 'develop'
Haelwenn [Mon, 26 Nov 2018 19:56:49 +0000 (19:56 +0000)]
Merge branch 'add-manifest-src-to-csp' into 'develop'

Add manifest-src to CSP to allow manifest.json

See merge request pleroma/pleroma!474

5 years agoAdd manifest-src to allow manifest.json
shibayashi [Mon, 26 Nov 2018 19:48:24 +0000 (20:48 +0100)]
Add manifest-src to allow manifest.json

5 years agoMerge branch 'bugfix/public-mastoapi-websocket' into 'develop'
kaniini [Sun, 25 Nov 2018 02:54:54 +0000 (02:54 +0000)]
Merge branch 'bugfix/public-mastoapi-websocket' into 'develop'

Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints

See merge request pleroma/pleroma!471

5 years agoversion string: force git abbrev size to 8 chars
href [Sat, 24 Nov 2018 13:38:34 +0000 (14:38 +0100)]
version string: force git abbrev size to 8 chars

Fixes #389

Older git versions defaults to 7 chars.

5 years agoWeb.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket
Haelwenn (lanodan) Monnier [Sat, 24 Nov 2018 07:47:35 +0000 (08:47 +0100)]
Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket

5 years agoWeb.Streamer: Get unauthenticated statuses representation
Haelwenn (lanodan) Monnier [Sat, 24 Nov 2018 07:45:45 +0000 (08:45 +0100)]
Web.Streamer: Get unauthenticated statuses representation

5 years agoWeb.MastodonAPI.MastodonSocket: Put access_token at function-level
Haelwenn (lanodan) Monnier [Sat, 24 Nov 2018 05:43:03 +0000 (06:43 +0100)]
Web.MastodonAPI.MastodonSocket: Put access_token at function-level

5 years agoWeb.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
Haelwenn (lanodan) Monnier [Sat, 24 Nov 2018 05:13:36 +0000 (06:13 +0100)]
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints

reported by soka on CRTNet

5 years agoMerge branch 'feature/admin-api' into 'develop'
kaniini [Thu, 22 Nov 2018 00:28:04 +0000 (00:28 +0000)]
Merge branch 'feature/admin-api' into 'develop'

Add a admin API

See merge request pleroma/pleroma!366

5 years agoMerge branch 'feature/improve-version' into 'develop'
kaniini [Wed, 21 Nov 2018 16:53:38 +0000 (16:53 +0000)]
Merge branch 'feature/improve-version' into 'develop'

Improved version string

See merge request pleroma/pleroma!467

5 years agoMerge branch 'runtime-fixes' into 'develop'
kaniini [Tue, 20 Nov 2018 22:25:35 +0000 (22:25 +0000)]
Merge branch 'runtime-fixes' into 'develop'

Various runtime configuration fixes

See merge request pleroma/pleroma!468

5 years agoMerge branch 'feature/retry-queue' into 'develop'
Haelwenn [Tue, 20 Nov 2018 19:04:52 +0000 (19:04 +0000)]
Merge branch 'feature/retry-queue' into 'develop'

Federator: add retry queue.

See merge request pleroma/pleroma!323

5 years agoMerge branch 'fix/mediaproxy-empty-url' into 'develop'
kaniini [Tue, 20 Nov 2018 18:09:46 +0000 (18:09 +0000)]
Merge branch 'fix/mediaproxy-empty-url' into 'develop'

mediaproxy: fix empty url & add some tests

See merge request pleroma/pleroma!466

5 years agoImproved version string
href [Tue, 20 Nov 2018 16:55:03 +0000 (17:55 +0100)]
Improved version string

5 years agomediaproxy: fix empty url & add some tests
href [Tue, 20 Nov 2018 16:46:54 +0000 (17:46 +0100)]
mediaproxy: fix empty url & add some tests

5 years agoRetryQueue: tiny refractor, add tests
eal [Mon, 19 Nov 2018 16:08:41 +0000 (18:08 +0200)]
RetryQueue: tiny refractor, add tests

5 years agoVarious runtime configuration fixes
href [Fri, 16 Nov 2018 20:35:08 +0000 (21:35 +0100)]
Various runtime configuration fixes

5 years agoMerge branch 'update/pleroma-fe-20181118' into 'develop'
kaniini [Sun, 18 Nov 2018 17:29:25 +0000 (17:29 +0000)]
Merge branch 'update/pleroma-fe-20181118' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!464

5 years agoupdate pleroma frontend
William Pitcock [Sun, 18 Nov 2018 17:27:48 +0000 (17:27 +0000)]
update pleroma frontend

5 years agoFederator: add retry queue.
eal [Sun, 26 Aug 2018 18:17:13 +0000 (21:17 +0300)]
Federator: add retry queue.

5 years agoMerge branch 'security/as2-object-render-hardening' into 'develop'
lambda [Sat, 17 Nov 2018 22:43:45 +0000 (22:43 +0000)]
Merge branch 'security/as2-object-render-hardening' into 'develop'

activitypub: object view: avoid leaking private details

See merge request pleroma/pleroma!463

5 years agoactivitypub: object view: avoid leaking private details
William Pitcock [Sat, 17 Nov 2018 22:29:08 +0000 (22:29 +0000)]
activitypub: object view: avoid leaking private details

5 years agoMerge branch 'bugfix/notice-urls-should-return-objects' into 'develop'
lambda [Sat, 17 Nov 2018 22:20:08 +0000 (22:20 +0000)]
Merge branch 'bugfix/notice-urls-should-return-objects' into 'develop'

ostatus controller: respond with AS2 objects instead of activities to notice URIs

Closes #289 and #383

See merge request pleroma/pleroma!462

5 years agoostatus controller: respond with AS2 objects instead of activities to notice URIs
William Pitcock [Sat, 17 Nov 2018 22:10:15 +0000 (22:10 +0000)]
ostatus controller: respond with AS2 objects instead of activities to notice URIs

5 years agoMerge branch 'security/spoofing-hardening' into 'develop'
lambda [Sat, 17 Nov 2018 21:52:51 +0000 (21:52 +0000)]
Merge branch 'security/spoofing-hardening' into 'develop'

security: spoofing hardening

Closes #380, #381, and #382

See merge request pleroma/pleroma!461

5 years agotests: federator: fix formatting
William Pitcock [Sat, 17 Nov 2018 21:41:08 +0000 (21:41 +0000)]
tests: federator: fix formatting

5 years agoactivitypub: transmogrifier: make deletes secure
William Pitcock [Sat, 17 Nov 2018 21:22:30 +0000 (21:22 +0000)]
activitypub: transmogrifier: make deletes secure

5 years agoWeb.AdminAPI.AdminAPIControllerTest: New Test
Haelwenn (lanodan) Monnier [Sat, 17 Nov 2018 21:11:18 +0000 (22:11 +0100)]
Web.AdminAPI.AdminAPIControllerTest: New Test

5 years agoWeb.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit
Haelwenn (lanodan) Monnier [Sat, 17 Nov 2018 21:10:23 +0000 (22:10 +0100)]
Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit

5 years agotest/plugs/user_is_admin_plug_test: New test
Haelwenn (lanodan) Monnier [Sat, 17 Nov 2018 19:04:54 +0000 (20:04 +0100)]
test/plugs/user_is_admin_plug_test: New test

5 years agolib/mix/tasks/relay*: Use a with block
Haelwenn (lanodan) Monnier [Sat, 10 Nov 2018 14:53:37 +0000 (15:53 +0100)]
lib/mix/tasks/relay*: Use a with block

5 years agoChange Relay from `status` to `{status, message}`
Haelwenn (lanodan) Monnier [Sat, 10 Nov 2018 14:31:37 +0000 (15:31 +0100)]
Change Relay from `status` to `{status, message}`

5 years agoWeb.Router: Change right to permission group (except for function names)
Haelwenn (lanodan) Monnier [Sat, 10 Nov 2018 14:20:49 +0000 (15:20 +0100)]
Web.Router: Change right to permission group (except for function names)

5 years agotest: add sanity tests for federator handling of AP docs
William Pitcock [Sat, 17 Nov 2018 21:01:19 +0000 (21:01 +0000)]
test: add sanity tests for federator handling of AP docs

5 years agofederator: return :ok or :error depending on if an AP doc was accepted or not
William Pitcock [Sat, 17 Nov 2018 21:00:37 +0000 (21:00 +0000)]
federator: return :ok or :error depending on if an AP doc was accepted or not

5 years agofederator: do origin containment when processing inbound messages
William Pitcock [Sat, 17 Nov 2018 20:43:43 +0000 (20:43 +0000)]
federator: do origin containment when processing inbound messages

5 years agotests: add a test to verify the general fake direction protection works in all cases
William Pitcock [Sat, 17 Nov 2018 20:31:20 +0000 (20:31 +0000)]
tests: add a test to verify the general fake direction protection works in all cases

5 years agotests: add a testcase for user collision
William Pitcock [Sat, 17 Nov 2018 20:20:45 +0000 (20:20 +0000)]
tests: add a testcase for user collision

5 years agoactivitypub: user fetching: use fetch_and_contain_remote_object_from_id()
William Pitcock [Sat, 17 Nov 2018 20:13:38 +0000 (20:13 +0000)]
activitypub: user fetching: use fetch_and_contain_remote_object_from_id()

5 years agotests: add tests for contain_origin_from_id()
William Pitcock [Sat, 17 Nov 2018 20:07:49 +0000 (20:07 +0000)]
tests: add tests for contain_origin_from_id()

5 years agoactivitypub: factor out AP object fetching to it's own function and add ID-based...
William Pitcock [Sat, 17 Nov 2018 20:02:02 +0000 (20:02 +0000)]
activitypub: factor out AP object fetching to it's own function and add ID-based containment

5 years agoWeb.AdminAPI.AdminAPIController: Change right to permission group (except for functio...
Haelwenn (lanodan) Monnier [Sat, 10 Nov 2018 14:16:19 +0000 (15:16 +0100)]
Web.AdminAPI.AdminAPIController: Change right to permission group (except for function names)

5 years agolib/mix/tasks/relay_{un,}follow.ex: Use a with block
Haelwenn (lanodan) Monnier [Sat, 10 Nov 2018 14:08:03 +0000 (15:08 +0100)]
lib/mix/tasks/relay_{un,}follow.ex: Use a with block

5 years agolib/pleroma/web/admin_api/admin_api_controller.ex: Support status reply of Relay...
Haelwenn (lanodan) Monnier [Sat, 10 Nov 2018 13:55:49 +0000 (14:55 +0100)]
lib/pleroma/web/admin_api/admin_api_controller.ex: Support status reply of Relay.{un,}follow

5 years agolib/mix/tasks/relay_{un,}follow.ex: Support status reply of Relay.{un,}follow
Haelwenn (lanodan) Monnier [Sat, 10 Nov 2018 13:55:32 +0000 (14:55 +0100)]
lib/mix/tasks/relay_{un,}follow.ex: Support status reply of Relay.{un,}follow

5 years agoPleroma.Web.ActivityPub.Relay: make {un,}follow return :ok only if it worked, :error...
Haelwenn (lanodan) Monnier [Sat, 10 Nov 2018 13:49:02 +0000 (14:49 +0100)]
Pleroma.Web.ActivityPub.Relay: make {un,}follow return :ok only if it worked, :error if it didn’t

5 years agolib/pleroma/plugs/user_is_admin_plug.ex: change 403 string to “User is not admin.”
Haelwenn (lanodan) Monnier [Sat, 10 Nov 2018 13:43:22 +0000 (14:43 +0100)]
lib/pleroma/plugs/user_is_admin_plug.ex: change 403 string to “User is not admin.”

5 years agolib/pleroma/web/admin_api/admin_api_controller.ex: An admin cannot un-admin themselves
Haelwenn (lanodan) Monnier [Sat, 10 Nov 2018 13:42:34 +0000 (14:42 +0100)]
lib/pleroma/web/admin_api/admin_api_controller.ex: An admin cannot un-admin themselves

5 years agoPleroma.Web.AdminAPI.AdminAPIController: user_create statement format
Haelwenn (lanodan) Monnier [Fri, 2 Nov 2018 07:30:52 +0000 (08:30 +0100)]
Pleroma.Web.AdminAPI.AdminAPIController: user_create statement format

5 years agoAdd get endpoints for rights [AdminAPI]
Haelwenn (lanodan) Monnier [Fri, 2 Nov 2018 07:19:56 +0000 (08:19 +0100)]
Add get endpoints for rights [AdminAPI]

5 years agoFix connection returns make generic right endpoint [AdminAPI]
Haelwenn (lanodan) Monnier [Fri, 2 Nov 2018 07:15:09 +0000 (08:15 +0100)]
Fix connection returns make generic right endpoint [AdminAPI]

5 years agoadmin_api_controller.ex: fix remaining params at once
Haelwenn (lanodan) Monnier [Fri, 12 Oct 2018 04:43:08 +0000 (06:43 +0200)]
admin_api_controller.ex: fix remaining params at once

5 years agoadmin_api_controller.ex: Add documentation, fix get_invite_token
Haelwenn (lanodan) Monnier [Fri, 12 Oct 2018 04:37:37 +0000 (06:37 +0200)]
admin_api_controller.ex: Add documentation, fix get_invite_token

5 years agoadmin_api_controller.ex: get_password_reset: fix params and response
Haelwenn (lanodan) Monnier [Fri, 12 Oct 2018 04:28:20 +0000 (06:28 +0200)]
admin_api_controller.ex: get_password_reset: fix params and response

5 years agolib/pleroma/web/admin_api/admin_api_controller.ex: Pleroma.Web.AdminAPI.Controller...
Haelwenn (lanodan) Monnier [Fri, 12 Oct 2018 04:26:58 +0000 (06:26 +0200)]
lib/pleroma/web/admin_api/admin_api_controller.ex: Pleroma.Web.AdminAPI.Controller → Pleroma.Web.AdminAPI.AdminAPIController

5 years ago[Pleroma.Plugs.UserIsAdminPlug]: Check if admin is true instead of false, fix error...
Haelwenn (lanodan) Monnier [Fri, 12 Oct 2018 04:25:50 +0000 (06:25 +0200)]
[Pleroma.Plugs.UserIsAdminPlug]: Check if admin is true instead of false, fix error reporting

5 years agolib/mix/tasks/make_admin.ex: New task
Haelwenn (lanodan) Monnier [Fri, 12 Oct 2018 03:12:09 +0000 (05:12 +0200)]
lib/mix/tasks/make_admin.ex: New task

5 years agolib/pleroma/plugs/user_is_admin_plug.ex: Create
Haelwenn (lanodan) Monnier [Tue, 2 Oct 2018 17:13:21 +0000 (19:13 +0200)]
lib/pleroma/plugs/user_is_admin_plug.ex: Create

5 years agoadmin_api_controller: Have some basic code
Haelwenn (lanodan) Monnier [Tue, 2 Oct 2018 17:03:05 +0000 (19:03 +0200)]
admin_api_controller: Have some basic code

5 years agoadmin_api_controller.ex: Create
Haelwenn (lanodan) Monnier [Tue, 2 Oct 2018 16:38:16 +0000 (18:38 +0200)]
admin_api_controller.ex: Create

5 years agoMerge branch 'security/actor-containment' into 'develop'
lambda [Sat, 17 Nov 2018 18:33:09 +0000 (18:33 +0000)]
Merge branch 'security/actor-containment' into 'develop'

security hotfix: actor containment

See merge request pleroma/pleroma!460