mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-12 05:07:06 +00:00
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. |
||
---|---|---|
.. | ||
activitypub | ||
admin | ||
api | ||
auth | ||
concerns | ||
oauth | ||
settings | ||
well_known | ||
about_controller_spec.rb | ||
account_follow_controller_spec.rb | ||
account_unfollow_controller_spec.rb | ||
accounts_controller_spec.rb | ||
application_controller_spec.rb | ||
authorize_interactions_controller_spec.rb | ||
emojis_controller_spec.rb | ||
follower_accounts_controller_spec.rb | ||
following_accounts_controller_spec.rb | ||
health_check_controller_spec.rb | ||
home_controller_spec.rb | ||
intents_controller_spec.rb | ||
invites_controller_spec.rb | ||
manifests_controller_spec.rb | ||
media_controller_spec.rb | ||
relationships_controller_spec.rb | ||
remote_follow_controller_spec.rb | ||
remote_interaction_controller_spec.rb | ||
shares_controller_spec.rb | ||
statuses_controller_spec.rb | ||
tags_controller_spec.rb |