mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-28 00:43:41 +01:00
12b935fadf
Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| connection_pool | ||
| importer | ||
| nodeinfo | ||
| ostatus | ||
| rss | ||
| settings | ||
| translation_service | ||
| vacuum | ||
| access_token_extension.rb | ||
| account_reach_finder.rb | ||
| activity_tracker.rb | ||
| advanced_text_formatter.rb | ||
| application_extension.rb | ||
| ascii_folding.rb | ||
| cache_buster.rb | ||
| delivery_failure_tracker.rb | ||
| emoji_formatter.rb | ||
| entity_cache.rb | ||
| extractor.rb | ||
| fast_geometry_parser.rb | ||
| fast_ip_map.rb | ||
| feed_manager.rb | ||
| hash_object.rb | ||
| hashtag_normalizer.rb | ||
| html_aware_formatter.rb | ||
| inline_renderer.rb | ||
| link_details_extractor.rb | ||
| permalink_redirector.rb | ||
| plain_text_formatter.rb | ||
| potential_friendship_tracker.rb | ||
| rate_limiter.rb | ||
| redis_configuration.rb | ||
| request.rb | ||
| request_pool.rb | ||
| response_with_limit.rb | ||
| scope_parser.rb | ||
| scope_transformer.rb | ||
| search_query_parser.rb | ||
| search_query_transformer.rb | ||
| status_cache_hydrator.rb | ||
| status_filter.rb | ||
| status_finder.rb | ||
| status_reach_finder.rb | ||
| suspicious_sign_in_detector.rb | ||
| tag_manager.rb | ||
| text_formatter.rb | ||
| themes.rb | ||
| translation_service.rb | ||
| user_settings_serializer.rb | ||
| vacuum.rb | ||
| validation_error_formatter.rb | ||
| video_metadata_extractor.rb | ||
| webfinger.rb | ||
| webfinger_resource.rb | ||