0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-29 16:46:51 +00:00
mastodon/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
active_record Remove dependency on pluck_each gem () 2021-04-12 03:35:58 +02:00
assets
chewy/strategy
devise
generators
json_ld
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 () 2022-02-22 17:11:22 +01:00
rails
redis
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 () 2021-05-06 14:22:54 +02:00
webpacker
cli.rb Add ability for admins to delete canonical email blocks () 2021-12-17 23:02:14 +01:00
enumerable.rb
exceptions.rb Fix media redownload worker retrying on unexpected response codes () 2021-05-05 23:46:59 +02:00
sidekiq_error_handler.rb Fix warnings on Rails boot () 2021-12-27 00:47:20 +01:00