mastodon/app
Claire 954e052b07 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/media_attachment.rb`:
  Upstream moved hardcoded values around, while in glitch-soc they are
  configurable.
  Moved them like upstream, but keeping glitch-soc's ability to configure
  them through env vars.
2022-02-22 18:06:29 +01:00
..
chewy Add trending links (#16917) 2021-11-25 13:07:38 +01:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-02-19 11:33:18 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-02-22 18:06:29 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-02-22 18:06:29 +01:00
mailers Fix sign in token and warning emails failed to send in some cases (#17589) 2022-02-18 20:43:42 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-02-22 18:06:29 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2022-02-11 21:53:20 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2022-02-12 11:12:41 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-02-08 18:23:53 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2022-02-22 18:06:29 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-02-12 11:12:41 +01:00