mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02: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. |
||
---|---|---|
.. | ||
account_controller_concern.rb | ||
account_owned_concern.rb | ||
accountable_concern.rb | ||
authorization.rb | ||
cache_concern.rb | ||
captcha_concern.rb | ||
challengable_concern.rb | ||
export_controller_concern.rb | ||
localized.rb | ||
rate_limit_headers.rb | ||
registration_spam_concern.rb | ||
session_tracking_concern.rb | ||
sign_in_token_authentication_concern.rb | ||
signature_authentication.rb | ||
signature_verification.rb | ||
status_controller_concern.rb | ||
theming_concern.rb | ||
two_factor_authentication_concern.rb | ||
user_tracking_concern.rb |