1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-05 18:28:50 +09:00
YuruToot/app
Claire 29b5c5f483 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/custom_emoji.rb`:
  Slight refactor upstream, next to a line that was different in glitch-soc
  because of our local configurable limits on custom emoji size.
  Ported upstream changes.
- `yarn.lock`:
  Not really a conflict, upstream dependency textually too close to a
  glitch-soc-only dependency.
  Updated upstream dependency as upstream.
2021-09-30 00:01:20 +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-09-26 18:28:59 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
javascript Fixup style issue 2021-09-28 13:24:34 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-09-30 00:01:20 +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-09-30 00:01:20 +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-09-14 13:50:30 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2021-09-26 18:28:59 +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-09-14 13:50:30 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2021-08-20 13:01:50 +02:00