e193c848fe
Conflicts: - `config/initializers/content_security_policy.rb`: Upstream added some code to add the Identity Provider's sign-in endpoint to the `form-action` Content Security Policy directive but our version of the file is pretty different. Ported the change. |
||
|---|---|---|
| .. | ||
| access_token_tracking_concern.rb | ||
| account_controller_concern.rb | ||
| account_owned_concern.rb | ||
| accountable_concern.rb | ||
| admin_export_controller_concern.rb | ||
| api_caching_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 | ||