mastodon/app
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
..
chewy Change tootctl search deploy algorithm (#14300) 2020-07-14 18:10:35 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
javascript [Glitch] Fix pop-in player display when poster has long username or handle 2021-07-08 16:23:09 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-05-22 13:11:31 +02:00
mailers Prepare Mastodon for Rails 6 (#15911) 2021-03-17 10:09:55 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2021-02-22 15:23:46 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2021-05-22 13:11:31 +02:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2021-06-24 08:08:02 +02:00