Henry Jameson e7ff752c52 Merge remote-tracking branch 'origin/develop' into shigusegubu ... * origin/develop: (218 commits) http: bump connection timeout to 10 seconds Fix prometheus-ecto error when not configured Document MRF.Simple :report_removal Add virtual :thread_muted? field Move default mascot configuration to `config/` Add changelog entry for mascot config Use string map for default mascot Format mascot tests Add mascot get/set tests Add API endpoints for a custom user mascot Add report filtering to MRF.SimplePolicy add Changelog entry also suppress link previews from posts marked #nsfw add CHANGELOG entry config: make sending the user agent configurable, disable sending the user agent in tests http: request builder: send user-agent when making requests rich media: suppress link previews if post is marked as sensitive mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw CI: Use the correct image with the correct hostname. RUM: Set rum status by the environment. ...		2019-05-22 00:02:44 +03:00
..
config.exs	Merge remote-tracking branch 'origin/develop' into shigusegubu	2019-05-22 00:02:44 +03:00
custom_emoji.txt	updates	2019-04-28 18:32:58 +03:00
dev.exs	s/Pleroma.Mailer/Pleroma.Emails.Mailer/	2019-04-10 06:33:19 +02:00
emoji.txt	Adding tag to emoji ets table	2019-04-01 17:17:57 +07: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	config: make sending the user agent configurable, disable sending the user agent in tests	2019-05-17 20:28:58 +00:00