mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02: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. |
||
|---|---|---|
| .. | ||
| accounts | ||
| apps | ||
| instances | ||
| lists | ||
| polls | ||
| push | ||
| statuses | ||
| timelines | ||
| accounts_controller.rb | ||
| apps_controller.rb | ||
| blocks_controller.rb | ||
| bookmarks_controller.rb | ||
| conversations_controller.rb | ||
| custom_emojis_controller.rb | ||
| domain_blocks_controller.rb | ||
| endorsements_controller.rb | ||
| favourites_controller.rb | ||
| filters_controller.rb | ||
| follow_requests_controller.rb | ||
| follows_controller.rb | ||
| instances_controller.rb | ||
| lists_controller.rb | ||
| media_controller.rb | ||
| mutes_controller.rb | ||
| notifications_controller.rb | ||
| polls_controller.rb | ||
| preferences_controller.rb | ||
| reports_controller.rb | ||
| scheduled_statuses_controller.rb | ||
| search_controller.rb | ||
| statuses_controller.rb | ||
| streaming_controller.rb | ||
| suggestions_controller.rb | ||