pleroma/config
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
..
config.exs Merge remote-tracking branch 'origin/develop' into shigusegubu 2019-04-06 22:24:38 +03:00
custom_emoji.txt customs 2018-08-04 18:23:11 +02:00
dev.exs config/dev.exs: Don’t put secure cookies on dev 2019-02-12 21:50:47 +01:00
emoji.txt customs 2018-08-04 18:23:11 +02:00
prod.exs [#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples. 2018-12-12 17:02:41 +03:00
test.exs Replace Pleroma.Jobs with pleroma_job_queue 2019-03-29 12:46:05 +00:00