mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 04:07:45 +00:00
ec49aa8175
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, we deleted it to not be flooded by Depandabot.
Kept deleted.
- `Gemfile.lock`:
Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
Upstream updated the serializer to support timed mutes, while
glitch-soc added a custom API ages ago to get information that
is already available elsewhere.
Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
🤷
- `app/models/user.rb`:
New user setting added upstream while we have glitch-soc-specific
user settings. Added upstream's user setting.
- `config/settings.yml`:
Upstream added a new user setting close to a user setting we had
changed the defaults for. Added the new upstream setting.
- `package.json`:
Upstream dependency updated “too close” to a glitch-soc-specific
dependency. No real conflict. Updated the dependency.
|
||
|---|---|---|
| .. | ||
| admin | ||
| keys | ||
| account_featured_tag_serializer.rb | ||
| account_serializer.rb | ||
| announcement_serializer.rb | ||
| application_serializer.rb | ||
| context_serializer.rb | ||
| conversation_serializer.rb | ||
| credential_account_serializer.rb | ||
| custom_emoji_serializer.rb | ||
| encrypted_message_serializer.rb | ||
| featured_tag_serializer.rb | ||
| filter_serializer.rb | ||
| identity_proof_serializer.rb | ||
| instance_serializer.rb | ||
| list_serializer.rb | ||
| marker_serializer.rb | ||
| media_attachment_serializer.rb | ||
| mute_serializer.rb | ||
| muted_account_serializer.rb | ||
| notification_serializer.rb | ||
| poll_serializer.rb | ||
| preferences_serializer.rb | ||
| preview_card_serializer.rb | ||
| reaction_serializer.rb | ||
| relationship_serializer.rb | ||
| report_serializer.rb | ||
| scheduled_status_serializer.rb | ||
| search_serializer.rb | ||
| status_serializer.rb | ||
| tag_serializer.rb | ||
| web_push_subscription_serializer.rb | ||