Henry Jameson 22bb706770 Merge remote-tracking branch 'origin/develop' into shigusegubu ... * origin/develop: (87 commits) Pin recon dependency to 2.4.0 Redirect to the referer url after mastofe authorization Mock :crypt.crypt/2 because otherwise the test fails on Mac OS Revert "Merge branch 'test-coverage' into 'develop'" Use --cover option when running CI tests We actually want the user id not nickname in the test... Also remove Repo functions in the tests Redundant Repo.get_by usage was recently removed from the codebase Document the admin API endpoints for controlling follow/unfollow Add user following / unfollowing to the admin api. Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi Add ability to ship logs to a Slack channel Code readability tweak Clean merge crumbs Serve metrics at `/api/pleroma/app_metrics` Document Prometheus [#1] fix telemetry Set up telemetry and prometheus Add recon mastodon_api_controller.ex: Add pleroma-tan to initial_state ...		2019-04-06 22:24:38 +03:00
..
mix/tasks/pleroma	Generate permissive or restrictive robots.txt in the config generator	2019-04-03 22:12:58 +05:45
pleroma	Merge remote-tracking branch 'origin/develop' into shigusegubu	2019-04-06 22:24:38 +03:00
jason_types.ex	Format the code.	2018-03-30 15:01:53 +02:00
transports.ex	Format the code.	2018-03-30 15:01:53 +02:00
xml_builder.ex	Format the code.	2018-03-30 15:01:53 +02:00