mastodon/config
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
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
initializers Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
locales Change appearance of account cards in web UI (#17689) 2022-03-07 11:38:52 +01:00
locales-glitch Add option (on by default) to allow toots with content warnings to trend 2022-02-26 10:46:26 +01:00
webpack Add support for multiple source files per pack 2022-02-12 00:10:28 +01:00
application.rb Add global `locale` param (#17464) 2022-02-08 02:34:56 +01:00
boot.rb Bump bootsnap from 1.6.0 to 1.8.1 (#16677) 2021-09-19 14:42:32 +09:00
brakeman.ignore Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
database.yml Escape database passwords in config/database.yml (#17627) 2022-02-25 01:16:52 +01:00
deploy.rb Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
environment.rb
i18n-tasks.yml Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 18:13:12 +01:00
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
pghero.yml
puma.rb
routes.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
secrets.yml
settings.yml Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
sidekiq.yml Change e-mail domain blocks to block IPs dynamically (#17635) 2022-02-24 17:28:23 +01:00
storage.yml Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
webpacker.yml