4ed09276d5
Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them. |
||
---|---|---|
.. | ||
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 |