mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02: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. |
||
---|---|---|
.. | ||
accounts | ||
admin | ||
announcements | ||
apps | ||
instances | ||
lists | ||
polls | ||
push | ||
statuses | ||
timelines | ||
accounts_controller_spec.rb | ||
announcements_controller_spec.rb | ||
apps_controller_spec.rb | ||
blocks_controller_spec.rb | ||
bookmarks_controller_spec.rb | ||
conversations_controller_spec.rb | ||
custom_emojis_controller_spec.rb | ||
domain_blocks_controller_spec.rb | ||
endorsements_controller_spec.rb | ||
favourites_controller_spec.rb | ||
filters_controller_spec.rb | ||
follow_requests_controller_spec.rb | ||
instances_controller_spec.rb | ||
lists_controller_spec.rb | ||
markers_controller_spec.rb | ||
media_controller_spec.rb | ||
mutes_controller_spec.rb | ||
notifications_controller_spec.rb | ||
polls_controller_spec.rb | ||
reports_controller_spec.rb | ||
statuses_controller_spec.rb | ||
streaming_controller_spec.rb | ||
suggestions_controller_spec.rb | ||
trends_controller_spec.rb |