mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-13 14:45:12 +01: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.
|
||
---|---|---|
.. | ||
activitypub | ||
connection_pool | ||
ostatus | ||
proof_provider/keybase | ||
rss | ||
settings | ||
delivery_failure_tracker_spec.rb | ||
extractor_spec.rb | ||
fast_ip_map_spec.rb | ||
feed_manager_spec.rb | ||
formatter_spec.rb | ||
hash_object_spec.rb | ||
language_detector_spec.rb | ||
request_pool_spec.rb | ||
request_spec.rb | ||
sanitize_config_spec.rb | ||
spam_check_spec.rb | ||
status_filter_spec.rb | ||
status_finder_spec.rb | ||
tag_manager_spec.rb | ||
user_settings_decorator_spec.rb | ||
webfinger_resource_spec.rb |