mastodon/config/environments
Claire f5a9971cac 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
..
development.rb Prepare Mastodon for Rails 6 (#15911) 2021-03-17 10:09:55 +01:00
production.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-04-20 12:17:14 +02:00
test.rb Misc. typos (#8694) 2018-09-14 00:53:09 +02:00