-
- Downloads
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts: # docs/config.md # mix.lock
No related branches found
No related tags found
Showing
- CHANGELOG.md 6 additions, 1 deletionCHANGELOG.md
- config/config.exs 6 additions, 0 deletionsconfig/config.exs
- config/description.exs 2837 additions, 0 deletionsconfig/description.exs
- docs/api/admin_api.md 7 additions, 3 deletionsdocs/api/admin_api.md
- docs/api/differences_in_mastoapi_responses.md 14 additions, 0 deletionsdocs/api/differences_in_mastoapi_responses.md
- docs/api/pleroma_api.md 12 additions, 2 deletionsdocs/api/pleroma_api.md
- docs/config.md 1 addition, 746 deletionsdocs/config.md
- lib/mix/tasks/pleroma/benchmark.ex 20 additions, 16 deletionslib/mix/tasks/pleroma/benchmark.ex
- lib/mix/tasks/pleroma/docs.ex 42 additions, 0 deletionslib/mix/tasks/pleroma/docs.ex
- lib/pleroma/activity.ex 56 additions, 149 deletionslib/pleroma/activity.ex
- lib/pleroma/activity/queries.ex 25 additions, 7 deletionslib/pleroma/activity/queries.ex
- lib/pleroma/application.ex 2 additions, 1 deletionlib/pleroma/application.ex
- lib/pleroma/docs/generator.ex 73 additions, 0 deletionslib/pleroma/docs/generator.ex
- lib/pleroma/docs/json.ex 20 additions, 0 deletionslib/pleroma/docs/json.ex
- lib/pleroma/docs/markdown.ex 78 additions, 0 deletionslib/pleroma/docs/markdown.ex
- lib/pleroma/healthcheck.ex 1 addition, 0 deletionslib/pleroma/healthcheck.ex
- lib/pleroma/object.ex 4 additions, 2 deletionslib/pleroma/object.ex
- lib/pleroma/plugs/cache.ex 122 additions, 0 deletionslib/pleroma/plugs/cache.ex
- lib/pleroma/user.ex 10 additions, 1 deletionlib/pleroma/user.ex
- lib/pleroma/web/activity_pub/activity_pub_controller.ex 58 additions, 19 deletionslib/pleroma/web/activity_pub/activity_pub_controller.ex
Loading
Please register or sign in to comment