b28ce2424c
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. - `lib/sanitize_ext/sanitize_config.rb`: Upstream renamed a constant that was used slightly differently in glitch-soc. Renamed it as upstream did. |
||
|---|---|---|
| .. | ||
| 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 | ||
| reviewable.rb | ||