Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

4a3a4607

Commit 4a3a4607 authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'security/follow-always-async' into 'develop'

AP follows must be always async (closes #306)

Closes #306

See merge request pleroma/pleroma!368

parents b638cc50 7b3fff9a

Branches

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

config/config.exs 2 additions, 1 deletion

config/config.exs
lib/pleroma/user.ex 25 additions, 26 deletions

lib/pleroma/user.ex
lib/pleroma/web/activity_pub/transmogrifier.ex 2 additions, 0 deletions

lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/activity_pub/utils.ex 2 additions, 2 deletions

lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 6 additions, 1 deletion

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/views/account_view.ex 10 additions, 1 deletion

lib/pleroma/web/mastodon_api/views/account_view.ex
lib/pleroma/web/twitter_api/twitter_api.ex 6 additions, 1 deletion

lib/pleroma/web/twitter_api/twitter_api.ex

with 53 additions and 32 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment