catstodon/app
Claire e855df149b Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.
2021-10-25 20:28:51 +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-10-25 20:28:51 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 22:14:26 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2021-10-25 20:28:51 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 22:22:39 +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-10-25 20:28:51 +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-10-14 21:44:57 +02:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2021-10-25 20:28:51 +02:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 22:14:26 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2021-08-20 13:01:50 +02:00