59e77b2e80
Merge branch 'main' of https://github.com/mastodon/mastodon into features/quote
2024-02-26 02:28:56 +00:00
Claire
b31af34c97
Merge pull request from GHSA-vm39-j3vx-pch3
...
* Prevent different identities from a same SSO provider from accessing a same account
* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`
* Rename methods to avoid confusion between OAuth and OmniAuth
2024-02-14 15:16:07 +01:00
Emelia Smith
e8b66a0525
Ignore legacy moderator and admin columns on User model ( #29188 )
2024-02-13 17:14:49 +00:00
c09bab16e1
Merge remote-tracking branch 'origin/features/main' into features/4.3alpha
2024-02-02 22:18:11 +09:00
Claire
98b5f85f10
Rename and refactor User#confirm!
to User#mark_email_as_confirmed!
( #28735 )
2024-01-15 18:04:58 +00:00
d342d103ba
Merge branch 'main' of https://github.com/mastodon/mastodon into features/main
2023-12-29 09:55:54 +00:00
Matt Jankowski
440b80b2e7
Model concerns organization into module namespaces ( #28149 )
2023-12-01 11:00:41 +00:00