mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-21 12:47:58 +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 | ||
| concerns | ||
| form | ||
| web | ||
| account.rb | ||
| account_alias.rb | ||
| account_conversation.rb | ||
| account_deletion_request.rb | ||
| account_domain_block.rb | ||
| account_filter.rb | ||
| account_identity_proof.rb | ||
| account_migration.rb | ||
| account_moderation_note.rb | ||
| account_note.rb | ||
| account_pin.rb | ||
| account_stat.rb | ||
| account_tag_stat.rb | ||
| account_warning.rb | ||
| account_warning_preset.rb | ||
| admin.rb | ||
| announcement.rb | ||
| announcement_filter.rb | ||
| announcement_mute.rb | ||
| announcement_reaction.rb | ||
| application_record.rb | ||
| backup.rb | ||
| block.rb | ||
| bookmark.rb | ||
| context.rb | ||
| conversation.rb | ||
| conversation_mute.rb | ||
| custom_emoji.rb | ||
| custom_emoji_category.rb | ||
| custom_emoji_filter.rb | ||
| custom_filter.rb | ||
| device.rb | ||
| direct_feed.rb | ||
| domain_allow.rb | ||
| domain_block.rb | ||
| email_domain_block.rb | ||
| encrypted_message.rb | ||
| export.rb | ||
| favourite.rb | ||
| featured_tag.rb | ||
| feed.rb | ||
| follow.rb | ||
| follow_request.rb | ||
| home_feed.rb | ||
| identity.rb | ||
| import.rb | ||
| instance.rb | ||
| instance_filter.rb | ||
| invite.rb | ||
| invite_filter.rb | ||
| ip_block.rb | ||
| list.rb | ||
| list_account.rb | ||
| list_feed.rb | ||
| marker.rb | ||
| media_attachment.rb | ||
| mention.rb | ||
| message_franking.rb | ||
| mute.rb | ||
| notification.rb | ||
| one_time_key.rb | ||
| poll.rb | ||
| poll_vote.rb | ||
| preview_card.rb | ||
| public_feed.rb | ||
| relationship_filter.rb | ||
| relay.rb | ||
| remote_follow.rb | ||
| report.rb | ||
| report_filter.rb | ||
| report_note.rb | ||
| scheduled_status.rb | ||
| search.rb | ||
| session_activation.rb | ||
| setting.rb | ||
| site_upload.rb | ||
| status.rb | ||
| status_pin.rb | ||
| status_stat.rb | ||
| system_key.rb | ||
| tag.rb | ||
| tag_feed.rb | ||
| tag_filter.rb | ||
| tombstone.rb | ||
| trending_tags.rb | ||
| unavailable_domain.rb | ||
| user.rb | ||
| user_invite_request.rb | ||
| web.rb | ||
| webauthn_credential.rb | ||