mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-29 19:40:23 -05:00
5ac380c122
Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream. |
||
|---|---|---|
| .. | ||
| access_token_tracking_concern.rb | ||
| account_controller_concern.rb | ||
| account_owned_concern.rb | ||
| accountable_concern.rb | ||
| admin_export_controller_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 | ||
| signature_authentication.rb | ||
| signature_verification.rb | ||
| theming_concern.rb | ||
| two_factor_authentication_concern.rb | ||
| user_tracking_concern.rb | ||
| web_app_controller_concern.rb | ||