luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-20 20:27:07 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/settings
History
Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Upstream dropping `digest` from notifications emails while we have more
  notification emails settings.
  Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
  Conflicts caused by glitch-soc's theming system.
  Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream removed a setting close to a glitch-soc-only setting.
  Applied upstream's change.
2022-08-28 11:31:00 +02:00
..
exports Add import/export feature for bookmarks (#14956) 2020-11-19 17:48:13 +01:00
migration Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
preferences
two_factor_authentication Merge branch 'main' into glitch-soc/merge-upstream 2021-08-27 11:29:03 +02:00
aliases_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
applications_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
base_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
deletes_controller.rb Fix user email address being banned on self-deletion (#16503) 2021-07-14 05:35:49 +02:00
exports_controller.rb Refactor how Redis locks are created (#18400) 2022-05-13 00:02:35 +02:00
featured_tags_controller.rb Change how hashtags are normalized (#18795) 2022-07-13 15:03:28 +02:00
flavours_controller.rb
imports_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
login_activities_controller.rb Fix login date not showing up in login history by using “public” pack 2021-06-23 12:21:40 +02:00
migrations_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
pictures_controller.rb Fix profile update not being sent on profile/header picture deletion (#15461) 2020-12-30 23:19:18 +01:00
preferences_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
profiles_controller.rb Add /api/v1/accounts/familiar_followers to REST API (#17700) 2022-03-07 09:36:47 +01:00
sessions_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
two_factor_authentication_methods_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00