Glitch-Shrike/app/views
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
..
about Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
accounts Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
admin Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
admin_mailer
application
auth Merge branch 'main' into glitch-soc/merge-upstream 2021-06-23 10:46:24 +02:00
authorize_interactions
directories Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
errors
filters Fix not being able to change world filter expiration back to “Never” (#15858) 2021-03-12 05:25:50 +01:00
follower_accounts
following_accounts
home Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
invites
kaminari
layouts Merge branch 'main' into glitch-soc/merge-upstream 2021-06-30 00:42:52 +02:00
media Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
notification_mailer
oauth
public_timelines Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
relationships Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
remote_follow
remote_interaction
settings Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
shared
shares
statuses Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
tags Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
user_mailer Fix missing source strings and inconsistent lead text style in admin UI (#16052) 2021-04-17 11:12:49 +02:00
well_known/host_meta