mastodon/lib/tasks
Claire e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream updated copyright year, we don't mention it so kept our version.
- `app/controllers/admin/dashboard_controller.rb`:
  Not really a conflict, upstream change (removing the spam checker) too close
  to glitch-soc changes. Ported upstream changes.
- `app/models/form/admin_settings.rb`:
  Same.
- `app/services/remove_status_service.rb`:
  Same.
- `app/views/admin/settings/edit.html.haml`:
  Same.
- `config/settings.yml`:
  Same.
- `config/environments/production.rb`:
  Not a real conflict, upstream added a default HTTP header, but we have
  extra headers in glitch-soc.
  Added the header.
2021-04-20 12:17:14 +02:00
..
assets.rake Override current_user when generating static pages 2018-12-19 20:49:58 +01:00
auto_annotate_models.rake Add announcements (#12662) 2020-01-23 22:00:13 +01:00
db.rake Improve account counters handling (#15913) 2021-03-19 13:14:57 +01:00
emojis.rake Add border to 🚲 emoji (#16035) 2021-04-13 23:43:51 +02:00
glitchsoc.rake
mastodon.rake Change mastodon:setup to not call assets:precompile in docker (#13942) 2021-03-24 10:37:24 +01:00
repo.rake Add missing locale file for ga and add rake task to check for it (#11813) 2019-09-12 04:58:33 +02:00
statistics.rake