yoheizuho
59e77b2e80
Merge branch 'main' of https://github.com/mastodon/mastodon into features/quote
2024-02-26 02:28:56 +00:00
Matt Jankowski and GitHub
785e2f9399
Add scope providing_styles to UserRole ( #29286 )
2024-02-20 09:18:05 +00:00
Claire and GitHub
d4d0565b0f
Fix user creation failure handling in OAuth paths ( #29207 )
2024-02-14 21:49:45 +00:00
Claire and GitHub
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
Claire and GitHub
7efc33b909
Move HTTP Signature parsing code to its own class ( #28932 )
2024-02-07 13:35:37 +00:00
Claire and GitHub
eeabf9af72
Fix compatibility with Redis <6.2 ( #29123 )
2024-02-07 11:52:38 +00:00
Matt Jankowski and GitHub
2f19ddd1fa
Move status serializer error handling to private method ( #29031 )
2024-02-06 14:54:26 +00:00
Matt Jankowski and GitHub
93a5b3f9df
Move status serializer chooser to private method ( #29030 )
2024-02-06 13:33:42 +00:00
Matt Jankowski and GitHub
0877f6fda4
Remove redundant return in IntentsController ( #29099 )
2024-02-06 12:56:22 +00:00
Matt Jankowski and GitHub
4cf07ed78c
Add missing action logging to api/v1/admin/reports#update ( #29044 )
2024-02-06 11:34:11 +00:00
yoheizuho
f16b068156
Merge remote-tracking branch 'origin/features/main' into features/quote
2024-02-04 11:40:23 +09:00
yoheizuho
c09bab16e1
Merge remote-tracking branch 'origin/features/main' into features/4.3alpha
2024-02-02 22:18:11 +09:00
kyori19 and GitHub
4b2272c34e
Merge remote-tracking branch 'upstream/main' into custom/quote
2024-02-01 20:00:27 +00:00
Claire and GitHub
1726085db5
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
2024-02-01 15:56:46 +01:00
Matt Jankowski and GitHub
42ab855b23
Add specs for Instance model scopes and add with_domain_follows scope ( #28767 )
2024-01-25 15:28:27 +00:00
Matt Jankowski and GitHub
17ea22671d
Fix Style/GuardClause cop in app/controllers ( #28420 )
2024-01-25 15:13:41 +00:00
Matt Jankowski and GitHub
7c9c6c7f80
Fix remaining Rails/WhereExists cop violations, regenerate todo ( #28892 )
2024-01-25 12:37:07 +00:00
Claire and GitHub
c50274a0ac
Fix redirect confirmation for accounts ( #28902 )
2024-01-25 10:44:25 +00:00
b19ae521b7
Add confirmation when redirecting logged-out requests to permalink ( #27792 )
...
Co-authored-by: Claire <[email protected]
2024-01-24 10:49:19 +00:00
Eugen Rochko and GitHub
5b1eb09d54
Add annual reports for accounts ( #28693 )
2024-01-24 09:38:10 +00:00
Matt Jankowski and GitHub
c0e8e457ab
Eager loading fixes for api/ controllers ( #28848 )
2024-01-23 11:41:54 +00:00
Claire and GitHub
e2d9635074
Add notification email on invalid second authenticator ( #28822 )
2024-01-22 13:55:43 +00:00
Matt Jankowski and GitHub
18004bf227
Add Account.matches_uri_prefix scope and use in activitypub/followers_synchronizations controller ( #28820 )
2024-01-22 13:55:37 +00:00
Matt Jankowski and GitHub
7ecf7f5403
Move controller->request specs for api/v1/statuses/* ( #28818 )
2024-01-22 11:58:54 +00:00
Claire and GitHub
3593ee2e36
Add rate-limit of TOTP authentication attempts at controller level ( #28801 )
2024-01-19 12:19:49 +00:00
Matt Jankowski and GitHub
329911b0a3
Migrate controller->request spec for api/v1/follow* ( #28811 )
2024-01-19 09:32:41 +00:00
Matt Jankowski and GitHub
1480573c83
Add Account.auditable scope, fix N+1 in admin/action_logs#index ( #28812 )
2024-01-19 01:39:30 +00:00
Matt Jankowski and GitHub
0b853678a4
Add coverage for api/v1/peers/search endpoint and extract controller query to Instance scope ( #28796 )
2024-01-18 15:57:10 +00:00
Claire and GitHub
98b5f85f10
Rename and refactor User#confirm! to User#mark_email_as_confirmed! ( #28735 )
2024-01-15 18:04:58 +00:00
Matt Jankowski and GitHub
e72676e83a
Improve api/v1/markers#create performance against simultaneous requests ( #28718 )
2024-01-15 09:47:25 +00:00
Matt Jankowski and GitHub
7801db7ba4
Spec coverage for custom css endpoint ( #28706 )
2024-01-12 09:19:25 +00:00
Matt Jankowski and GitHub
575ab085be
Disable Rails/ApplicationController for HealthController ( #28705 )
2024-01-12 09:08:17 +00:00
Claire and GitHub
d7e13e2483
Fix potential redirection loop of streaming endpoint ( #28665 )
2024-01-10 15:05:46 +00:00
Jean Boussier and GitHub
5a6d533c53
Enable Rails 7.1 Marshalling format ( #28609 )
2024-01-05 21:57:47 +00:00
kyori19 and GitHub
d1369ca959
Merge remote-tracking branch 'upstream/main' into custom/quote
2024-01-05 07:04:07 +00:00
Claire and GitHub
419c659bc4
Add fallback redirection when getting a webfinger query WEB_DOMAIN@WEB_DOMAIN ( #28592 )
2024-01-04 14:14:46 +00:00
Claire and GitHub
dfdadb92e8
Add ability to require approval when users sign up using specific email domains ( #28468 )
2024-01-04 09:07:05 +00:00
Matt Jankowski and GitHub
e12d8893f4
Fix intermittent failure from unspecified order in export_domain_blocks controller spec ( #28562 )
2024-01-03 13:06:15 +00:00
Claire and GitHub
092bb8a27a
Fix Mastodon not correctly processing HTTP Signatures with query strings ( #28476 )
2024-01-03 11:29:26 +00:00
Claire and GitHub
1184887b01
Fix streaming API redirection ignoring the port of streaming_api_base_url ( #28558 )
2024-01-02 12:27:51 +00:00
yoheizuho
4c2f549331
fix typo
2023-12-31 06:47:19 +00:00
yoheizuho
d89bff03c9
fix quote 500 error
2023-12-31 06:23:17 +00:00
yoheizuho
d342d103ba
Merge branch 'main' of https://github.com/mastodon/mastodon into features/main
2023-12-29 09:55:54 +00:00
yoheizuho
6bd375adab
Merge branch 'main' of https://github.com/mastodon/mastodon into features/main
2023-12-29 09:54:22 +00:00
b5ac61b2c5
Change algorithm of follow recommendations ( #28314 )
...
Co-authored-by: Claire <[email protected]
2023-12-19 10:59:43 +00:00
Matt Jankowski and GitHub
c28976d89e
Handle negative offset param in api/v2/search ( #28282 )
2023-12-19 10:55:39 +00:00
Claire and GitHub
7d9b209fe8
Fix call to inefficient delete_matched cache method in domain blocks ( #28374 )
2023-12-18 16:14:43 +00:00
Matt Jankowski and GitHub
0e5b8fc46b
Fix Style/RedundantReturn cop ( #28391 )
2023-12-18 09:50:51 +00:00
Matt Jankowski and GitHub
3bc437b99a
Fix Style/RedundantParentheses cop ( #28176 )
2023-12-01 16:00:44 +00:00
Matt Jankowski and GitHub
d83d01eb1e
Fix Lint/RedundantSafeNavigation cop ( #28172 )
2023-12-01 15:52:56 +00:00
yoheizuho
Matt JankowskiandGitHub
ClaireandGitHub
kyori19andGitHub
Jean BoussierandGitHub