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.
|
||
|---|---|---|
| .. | ||
| activitypub | ||
| account_search_service_spec.rb | ||
| after_block_domain_from_account_service_spec.rb | ||
| after_block_service_spec.rb | ||
| app_sign_up_service_spec.rb | ||
| authorize_follow_service_spec.rb | ||
| batched_remove_status_service_spec.rb | ||
| block_domain_service_spec.rb | ||
| block_service_spec.rb | ||
| bootstrap_timeline_service_spec.rb | ||
| clear_domain_media_service_spec.rb | ||
| delete_account_service_spec.rb | ||
| fan_out_on_write_service_spec.rb | ||
| favourite_service_spec.rb | ||
| fetch_link_card_service_spec.rb | ||
| fetch_oembed_service_spec.rb | ||
| fetch_remote_status_service_spec.rb | ||
| fetch_resource_service_spec.rb | ||
| follow_service_spec.rb | ||
| import_service_spec.rb | ||
| mute_service_spec.rb | ||
| notify_service_spec.rb | ||
| post_status_service_spec.rb | ||
| precompute_feed_service_spec.rb | ||
| process_mentions_service_spec.rb | ||
| reblog_service_spec.rb | ||
| reject_follow_service_spec.rb | ||
| remove_status_service_spec.rb | ||
| report_service_spec.rb | ||
| resolve_account_service_spec.rb | ||
| resolve_url_service_spec.rb | ||
| search_service_spec.rb | ||
| unallow_domain_service_spec.rb | ||
| unblock_domain_service_spec.rb | ||
| unblock_service_spec.rb | ||
| unfollow_service_spec.rb | ||
| unmute_service_spec.rb | ||
| update_account_service_spec.rb | ||
| verify_link_service_spec.rb | ||