mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-12 08:25:19 +00:00
c790ecb14d
Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes. |
||
|---|---|---|
| .. | ||
| accounts | ||
| admin | ||
| announcements | ||
| apps | ||
| featured_tags | ||
| instances | ||
| lists | ||
| polls | ||
| push | ||
| statuses | ||
| timelines | ||
| accounts_controller.rb | ||
| announcements_controller.rb | ||
| apps_controller.rb | ||
| blocks_controller.rb | ||
| bookmarks_controller.rb | ||
| conversations_controller.rb | ||
| custom_emojis_controller.rb | ||
| directories_controller.rb | ||
| domain_blocks_controller.rb | ||
| endorsements_controller.rb | ||
| favourites_controller.rb | ||
| featured_tags_controller.rb | ||
| filters_controller.rb | ||
| follow_requests_controller.rb | ||
| instances_controller.rb | ||
| lists_controller.rb | ||
| markers_controller.rb | ||
| media_controller.rb | ||
| mutes_controller.rb | ||
| notifications_controller.rb | ||
| polls_controller.rb | ||
| preferences_controller.rb | ||
| reports_controller.rb | ||
| scheduled_statuses_controller.rb | ||
| statuses_controller.rb | ||
| streaming_controller.rb | ||
| suggestions_controller.rb | ||
| trends_controller.rb | ||