mastodon-glitch/lib
Claire 1fbd1fa5c4 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/lib/user_settings_decorator.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/models/status.rb`:
  Conflict because of slight change in how glitch-soc handles the scope to
  filter out local-only posts for anonymous viewers.
  Took upstream's changes and re-applied glitch-soc's change.
- `app/models/user.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/views/directories/index.html.haml`:
  Conflict because upstream redesigned that page while glitch-soc had a minor
  change to support hiding the number of followers.
  Ported glitch-soc's change on top of upstream's redesign.

Additional changes:
- `app/models/account_statuses_filter.rb`:
  See change to `app/models/status.rb`.
2022-03-08 20:22:54 +01:00
..
action_dispatch replace all instances of "ends_with?" with "end_with?" (#15745) 2021-02-19 09:56:14 +01:00
active_record Remove dependency on pluck_each gem (#16012) 2021-04-12 03:35:58 +02:00
assets
chewy/strategy Fix unnecessary queries when batch-removing statuses, 100x faster (#15387) 2020-12-22 17:13:55 +01:00
devise Fix authentication before 2FA challenge (#11943) 2019-09-24 04:35:36 +02:00
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-03-08 20:22:54 +01:00
paperclip Fix some media attachments being converted with too high framerates (#17619) 2022-02-22 17:11:22 +01: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 Merge branch 'main' into glitch-soc/merge-upstream 2021-03-19 13:57:15 +01:00
tasks Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01: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 Fix media redownload worker retrying on unexpected response codes (#16111) 2021-05-05 23:46:59 +02:00
sidekiq_error_handler.rb Fix warnings on Rails boot (#16946) 2021-12-27 00:47:20 +01:00