mirror of
https://github.com/funamitech/mastodon
synced 2024-12-03 01:09:08 +09:00
077183a121
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. |
||
|---|---|---|
| .. | ||
| admin | ||
| accounts_helper.rb | ||
| application_helper.rb | ||
| branding_helper.rb | ||
| context_helper.rb | ||
| domain_control_helper.rb | ||
| email_helper.rb | ||
| flashes_helper.rb | ||
| formatting_helper.rb | ||
| home_helper.rb | ||
| instance_helper.rb | ||
| jsonld_helper.rb | ||
| languages_helper.rb | ||
| mascot_helper.rb | ||
| routing_helper.rb | ||
| settings_helper.rb | ||
| statuses_helper.rb | ||
| webfinger_helper.rb | ||