Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, upstream added helpers right next to glitch-soc only helpers. Added upstream's helpers. - `spec/models/status_spec.rb`: Not a real conflict, upstream added specs right next to glitch-soc only specs. Added upstream's tests. |
||
|---|---|---|
| .. | ||
| account | ||
| status | ||
| user | ||
| attachmentable.rb | ||
| browser_detection.rb | ||
| cacheable.rb | ||
| custom_filter_cache.rb | ||
| database_view_record.rb | ||
| domain_materializable.rb | ||
| domain_normalizable.rb | ||
| expireable.rb | ||
| follow_limitable.rb | ||
| legacy_otp_secret.rb | ||
| lockable.rb | ||
| paginable.rb | ||
| ranked_trend.rb | ||
| rate_limitable.rb | ||
| redisable.rb | ||
| relationship_cacheable.rb | ||
| remotable.rb | ||