mastodon-glitch/lib/mastodon
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
..
accounts_cli.rb Add optional domain restrict to tootctl accounts cull (#16511) 2021-10-14 21:09:56 +02:00
cache_cli.rb Change tootctl to use inline parallelization instead of Sidekiq (#11776) 2019-09-10 13:48:48 +02:00
canonical_email_blocks_cli.rb Add ability for admins to delete canonical email blocks (#16644) 2021-12-17 23:02:14 +01:00
cli_helper.rb Fix DB connection pool settings in CLI (#15983) 2021-03-31 17:46:17 +02:00
domains_cli.rb Add --by-uri option to `tootctl domains purge` (#16434) 2021-07-07 21:17:00 +02:00
email_domain_blocks_cli.rb Fixed code quality issues (#15541) 2021-01-31 21:26:09 +01:00
emoji_cli.rb Enable importing GIF emojis in CLI (#17706) 2022-03-06 23:41:44 +01:00
feeds_cli.rb Fix tootctl not allocating enough database connections for main thread (#12097) 2019-10-07 05:05:02 +02:00
ip_blocks_cli.rb Fix tootctl ip_blocks add failing if not given a comment (#15263) 2020-12-02 21:19:41 +01:00
maintenance_cli.rb Spelling (#17705) 2022-03-06 22:51:40 +01:00
media_cli.rb Skip blocked domains media on tootctl media refresh (#16914) 2021-10-28 19:30:44 +02:00
migration_helpers.rb Fix edge case in migration helpers that caused crash because of PostgreSQL quirks (#17398) 2022-01-30 22:34:54 +01:00
premailer_webpack_strategy.rb
preview_cards_cli.rb Change tootctl to use inline parallelization instead of Sidekiq (#11776) 2019-09-10 13:48:48 +02:00
redis_config.rb Add a Redis environment variable for sidekiq (#16188) 2021-05-09 10:40:17 +02:00
search_cli.rb Fix ElasticSearch to Elasticsearch (#17050) 2021-11-26 08:30:02 +01:00
settings_cli.rb Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00
snowflake.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
statuses_cli.rb Spelling (#17705) 2022-03-06 22:51:40 +01:00
upgrade_cli.rb Fix `tootctl upgrade storage-schema` S3 ACL (#13768) 2020-05-17 17:27:36 +02:00
version.rb Forward-port version bump to 3.4.6 (#17434) 2022-02-03 14:21:38 +01:00