mirror of https://github.com/Siphonay/mastodon
0d69cc068c
Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did. - `app/models/trends/statuses.rb`: Upstream added a date restriction to trendable posts, while glitch-soc had slightly different conditions. Added the date restriction to glitch-soc's conditions. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| api | ||
| auth | ||
| concerns | ||
| disputes | ||
| filters | ||
| oauth | ||
| settings | ||
| .rubocop.yml | ||
| application_controller_spec.rb | ||
| authorize_interactions_controller_spec.rb | ||
| filters_controller_spec.rb | ||
| follower_accounts_controller_spec.rb | ||
| following_accounts_controller_spec.rb | ||
| intents_controller_spec.rb | ||
| relationships_controller_spec.rb | ||
| statuses_cleanup_controller_spec.rb | ||
| statuses_controller_spec.rb | ||