Claire cdf20f4367 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/rest/instance_serializer.rb`: Upstream changed the fields returned by /api/v1/instance by adding a `configuration` field holding a lot of useful information making our `max_toot_chars` and `poll_limits` fields obsolete. Keeping those around for now for compatibility. - `app/validators/status_length_validator.rb`: No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to MAX_CHARS which is defined differently in glitch-soc. Ported upstream changes.		2021-07-11 21:41:23 +02:00
..
_action_log.html.haml	Fix brakeman warning (#15870)	2021-03-19 23:48:59 +01:00
_status.html.haml	Fix expand video on public page (#15469)	2020-12-30 23:18:11 +01:00
index.html.haml	Add ability to filter reports by origin of target account (#16487)	2021-07-11 11:01:38 +02:00
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00