mastodon/app
Claire 25a46d9e59 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/fonts/montserrat.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/models/account.rb`:
  Textual conflict only caused by glitch-soc using a different value
  for character limits in a nearby line.
  Applied upstream's changes.
- `app/views/statuses/_simple_status.html.haml`:
  Attribute added to a tag modified by glitch-soc.
  Added upstream's attributes.
- `yarn.lock`:
  Upstream added/updated dependencies close to glitch-soc-only ones.
  Updated/added upstream dependencies.
2022-06-02 09:49:38 +02:00
..
chewy Change algorithm of tootctl search deploy to improve performance (#18463) 2022-05-22 22:16:43 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
lib Fix TagManager#local_url? erroring out on invalid URL (#18580) 2022-05-31 18:25:24 +02:00
mailers Prevent use locale with empty string (#18543) 2022-05-28 14:32:08 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
policies Various code cleanup (#1782) 2022-05-25 12:27:11 +02:00
presenters Various code cleanup (#1782) 2022-05-25 12:27:11 +02:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-05-26 22:49:47 +02:00
validators Various code cleanup (#1782) 2022-05-25 12:27:11 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00