mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-28 01:53:41 +01:00
4df3b7cb06
Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| ostatus | ||
| settings | ||
| activity_tracker.rb | ||
| application_extension.rb | ||
| delivery_failure_tracker.rb | ||
| entity_cache.rb | ||
| exceptions.rb | ||
| extractor.rb | ||
| fast_geometry_parser.rb | ||
| feed_manager.rb | ||
| formatter.rb | ||
| hash_object.rb | ||
| inline_renderer.rb | ||
| language_detector.rb | ||
| potential_friendship_tracker.rb | ||
| request.rb | ||
| rss_builder.rb | ||
| sanitize_config.rb | ||
| sidekiq_error_handler.rb | ||
| status_filter.rb | ||
| status_finder.rb | ||
| tag_manager.rb | ||
| themes.rb | ||
| user_settings_decorator.rb | ||
| webfinger_resource.rb | ||