chuckya/lib/tasks
Claire 01d6f7529f Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream added a link to the roadmap, but we have a completely different README.
  Kept ours.
- `app/models/media_attachment.rb`:
  Upstream upped media attachment limits.
  Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream changed the migration compatibility level.
  Did so too.
- `config/initializers/content_security_policy.rb`:
  Upstream refactored this file but we have a different version.
  Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  The file does not directly references individual settings anymore.
  Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  The file got removed entirely.
  Removed it as well.
- `app/models/user.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  References to individual settings have been removed from the file.
  Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `config/settings.yml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  In particular, upstream removed user-specific and unused settings.
  Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
  Conflicts due to glitch-soc's theming system.
  Mostly kept our version, as upstream messed up the tests.
2023-03-31 21:30:27 +02:00
..
assets.rake Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
auto_annotate_models.rake Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
branding.rake Apply Rubocop Rails/RootPublicPath (#23447) 2023-02-08 10:38:07 +01:00
db.rake Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
emojis.rake Autofix Rubocop Style/RedundantArgument (#23798) 2023-03-16 10:34:00 +09:00
glitchsoc.rake Add Rake task to backfill local-only flag (#253) 2017-12-10 22:49:59 -06:00
mastodon.rake Autofix Rubocop Rails/RootPathnameMethods (#23760) 2023-02-22 09:57:15 +09:00
repo.rake Enable Rubocop Performance/DeleteSuffix (#24077) 2023-03-13 00:03:07 +01:00
statistics.rake Audofix Rubocop Style/WordArray (#23739) 2023-02-20 06:14:10 +01:00
tests.rake Change user settings to be stored in a more optimal way (#23630) 2023-03-30 14:44:00 +02:00