mastodon/lib
Claire a4fc7ac922 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
..
active_record Remove dependency on pluck_each gem (#16012) 2021-04-12 03:35:58 +02:00
assets Fix wrong aspect ratio of logo in icons (#18639) 2022-06-11 20:32:02 +02:00
chewy/strategy Change search indexing to use batches to minimize resource usage (#18451) 2022-05-18 23:29:14 +02:00
devise
generators
json_ld Fixed code quality issues (#15541) 2021-01-31 21:26:09 +01:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
paperclip Fix audio always being re-encoded even for passthrough-eligible media (#1839) 2022-09-02 09:29:31 +02:00
rails Fix obsolete digitalocean.rake file breaking rake tasks (#15618) 2021-02-11 02:11:30 +01:00
redis Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 2020-07-01 19:05:21 +02:00
sanitize_ext Fix link sanitization for outgoing text/html and text/markdown toots 2022-04-11 09:06:25 +02:00
simple_navigation Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
tasks Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
templates
terrapin Add Ruby 3.0 support (#16046) 2021-05-06 14:22:54 +02:00
webpacker Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
cli.rb Add ability for admins to delete canonical email blocks (#16644) 2021-12-17 23:02:14 +01:00
enumerable.rb Optimize map { ... }.compact calls (#15513) 2021-01-10 00:32:01 +01:00
exceptions.rb Improve error reporting and logging when processing remote accounts (#15605) 2022-09-20 23:30:26 +02:00