mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-30 16:49:04 +01:00
be493b6c0d
Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly. |
||
---|---|---|
.. | ||
accounts | ||
admin | ||
announcements | ||
apps | ||
instances | ||
lists | ||
polls | ||
push | ||
statuses | ||
timelines | ||
trends | ||
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 |