mirror of https://framagit.org/tykayn/mastodon.git
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 | ||
| nodeinfo | ||
| ostatus | ||
| proof_provider | ||
| rss | ||
| settings | ||
| activity_tracker.rb | ||
| application_extension.rb | ||
| delivery_failure_tracker.rb | ||
| entity_cache.rb | ||
| exceptions.rb | ||
| extractor.rb | ||
| fast_geometry_parser.rb | ||
| fast_ip_map.rb | ||
| feed_manager.rb | ||
| formatter.rb | ||
| hash_object.rb | ||
| inline_renderer.rb | ||
| language_detector.rb | ||
| potential_friendship_tracker.rb | ||
| proof_provider.rb | ||
| rate_limiter.rb | ||
| request.rb | ||
| request_pool.rb | ||
| response_with_limit.rb | ||
| rss_builder.rb | ||
| sanitize_config.rb | ||
| search_query_parser.rb | ||
| search_query_transformer.rb | ||
| sidekiq_error_handler.rb | ||
| spam_check.rb | ||
| status_filter.rb | ||
| status_finder.rb | ||
| tag_manager.rb | ||
| themes.rb | ||
| toc_generator.rb | ||
| user_settings_decorator.rb | ||
| webfinger.rb | ||
| webfinger_resource.rb | ||