-
- Downloads
Merge branch 'develop' into use-jobs-in-webpush
Showing
- config/config.exs 7 additions, 0 deletionsconfig/config.exs
- docs/api/admin_api.md 20 additions, 0 deletionsdocs/api/admin_api.md
- docs/api/prometheus.md 22 additions, 0 deletionsdocs/api/prometheus.md
- lib/pleroma/application.ex 19 additions, 0 deletionslib/pleroma/application.ex
- lib/pleroma/html.ex 7 additions, 8 deletionslib/pleroma/html.ex
- lib/pleroma/repo.ex 4 additions, 0 deletionslib/pleroma/repo.ex
- lib/pleroma/web/admin_api/admin_api_controller.ex 20 additions, 0 deletionslib/pleroma/web/admin_api/admin_api_controller.ex
- lib/pleroma/web/endpoint.ex 20 additions, 0 deletionslib/pleroma/web/endpoint.ex
- lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 13 additions, 6 deletionslib/pleroma/web/mastodon_api/mastodon_api_controller.ex
- lib/pleroma/web/mastodon_api/views/status_view.ex 11 additions, 3 deletionslib/pleroma/web/mastodon_api/views/status_view.ex
- lib/pleroma/web/metadata/utils.ex 1 addition, 1 deletionlib/pleroma/web/metadata/utils.ex
- lib/pleroma/web/oauth/oauth_controller.ex 6 additions, 0 deletionslib/pleroma/web/oauth/oauth_controller.ex
- lib/pleroma/web/router.ex 4 additions, 0 deletionslib/pleroma/web/router.ex
- lib/pleroma/web/twitter_api/views/activity_view.ex 3 additions, 3 deletionslib/pleroma/web/twitter_api/views/activity_view.ex
- mix.exs 7 additions, 0 deletionsmix.exs
- mix.lock 8 additions, 0 deletionsmix.lock
- test/plugs/legacy_authentication_plug_test.exs 10 additions, 8 deletionstest/plugs/legacy_authentication_plug_test.exs
- test/support/factory.ex 10 additions, 0 deletionstest/support/factory.ex
- test/web/admin_api/admin_api_controller_test.exs 46 additions, 0 deletionstest/web/admin_api/admin_api_controller_test.exs
- test/web/mastodon_api/mastodon_api_controller_test.exs 67 additions, 0 deletionstest/web/mastodon_api/mastodon_api_controller_test.exs
Loading
Please register or sign in to comment