luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 05:08:03 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/concerns
History
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
..
access_token_tracking_concern.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
account_controller_concern.rb Move link header setting to after_action (#24251) 2023-03-26 00:40:01 +01:00
account_owned_concern.rb Change public profile pages to be disabled for unconfirmed users (#17385) 2022-01-28 14:24:37 +01:00
accountable_concern.rb Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
admin_export_controller_concern.rb Change domain block CSV parsing to be more robust and handle more lists (#21470) 2023-01-18 16:20:52 +01:00
authorization.rb Bump pundit from 2.1.1 to 2.2.0 (#17543) 2022-02-19 13:30:06 +09:00
cache_concern.rb Fix Rails cache namespace being overriden with v2 for cached statuses (#24202) 2023-03-22 15:47:44 +01:00
captcha_concern.rb Change CAPTCHA handling to be only on email verification 2022-01-25 23:56:57 +01:00
challengable_concern.rb Bump rubocop from 0.86.0 to 0.88.0 (#14412) 2020-09-01 03:04:00 +02:00
export_controller_concern.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
localized.rb Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
rate_limit_headers.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
registration_spam_concern.rb Add honeypot fields and minimum fill-out time for sign-up form (#15276) 2020-12-10 06:27:26 +01:00
session_tracking_concern.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
signature_authentication.rb
signature_verification.rb Autofix Rubocop Style/RedundantArgument (#23798) 2023-03-16 10:34:00 +09:00
theming_concern.rb Add support for multiple source files per pack 2022-02-12 00:10:28 +01:00
two_factor_authentication_concern.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
user_tracking_concern.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
web_app_controller_concern.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-01-10 09:39:15 +01:00