mastodon/app/views/settings
Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/home_controller.rb`:
  Upstream made it so `/web` is available to non-logged-in users
  and `/` redirects to `/web` instead of `/about`.
  Kept our version since glitch-soc's WebUI doesn't have what's
  needed yet and I think /about is still a much better landing
  page anyway.
- `app/models/form/admin_settings.rb`:
  Upstream added new settings, and glitch-soc had an extra setting.
  Not really a conflict.
  Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a new `server` initial state object.
  Not really a conflict.
  Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
  Upstream added new settings.
  Not really a conflict.
  Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Upstream refactored that part and removed the file.
  Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
  Upstream added new settings.
  Not a real conflict.
  Added upstream's new settings.
2022-10-02 18:46:22 +02:00
..
aliases Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
applications Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
deletes Change path of privacy policy page (#19249) 2022-09-29 06:22:12 +02:00
exports Fix reference to non-existing translation in the exports page. (#15894) 2021-03-15 02:17:29 +01:00
featured_tags Change how hashtags are normalized (#18795) 2022-07-13 15:03:28 +02:00
flavours Fix settings/flavours 2019-03-16 16:21:20 +01:00
imports Add option to overwrite imported data (#9962) 2019-02-03 03:59:51 +01:00
login_activities Add full user agent in tooltips for login activities (#16428) 2021-06-23 16:42:23 +02:00
migration/redirects Add (back) option to set redirect notice on account without moving followers (#11994) 2019-09-29 05:03:19 +02:00
migrations Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
preferences Revert "Remove preference to aggregate reblogs in home/list feeds (#18112)" 2022-08-28 11:31:39 +02:00
profiles Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
shared
two_factor_authentication Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
two_factor_authentication_methods Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00