53b73ed6a2
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:25:15 +01:00
436419cc2f
Merge pull request from GHSA-7w3c-p9j8-mq3x
...
* Ensure destruction of OAuth Applications notifies streaming
Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.
* Ensure password resets revoke access to Streaming API
* Improve performance of deleting OAuth tokens
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-14 15:25:15 +01:00
b83076647e
Ignore legacy moderator and admin columns on User model ( #29188 )
2024-02-13 20:03:00 +01:00
541cbdd963
Add env variable support for number of followable hashtags in feed column ( #2500 )
...
* Add env variable support for number of followable hashtags in feed column.
* Add a note about performance concerns for higher values.
See discussion in https://github.com/glitch-soc/mastodon/pull/2500
* Update .devcontainer/docker-compose.yml
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-06 20:23:36 +01:00
bf153b384b
Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
- `app/controllers/auth/passwords_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
- `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
2024-01-27 19:06:41 +01:00
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
2024-01-25 19:51:19 +01:00
42ab855b23
Add specs for `Instance` model scopes and add `with_domain_follows` scope ( #28767 )
2024-01-25 15:28:27 +00:00
6b6586f5d0
Add `CustomFilterKeyword#to_regex` method ( #28893 )
2024-01-25 13:00:34 +00:00
22cfab0ebf
Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
Upstream made style fixes, while glitch-soc had extra options.
Ported upstream's style fixes.
2024-01-24 20:42:53 +01:00
38f7f8b909
Tidy up association declaration in `Instance` model ( #28880 )
2024-01-24 17:30:28 +00:00
7a1f087659
Add `created_before` and `updated_before` scopes to `MediaAttachment` ( #28869 )
2024-01-24 10:32:54 +00:00
9d413cbaf8
Fix `Rails/WhereExists` cop in app/models ( #28863 )
2024-01-24 09:57:49 +00:00
599bc69503
Simplify `AccountSummary.filtered` query generation ( #28868 )
2024-01-24 09:57:32 +00:00
5b1eb09d54
Add annual reports for accounts ( #28693 )
2024-01-24 09:38:10 +00:00
c0e8e457ab
Eager loading fixes for `api/` controllers ( #28848 )
2024-01-23 11:41:54 +00:00
b0207d7757
Add coverage for `Tag.recently_used` scope ( #28850 )
2024-01-23 09:10:11 +00:00
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
2024-01-22 19:19:40 +01:00
0700eb58bc
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream
2024-01-22 19:12:05 +01:00
18004bf227
Add `Account.matches_uri_prefix` scope and use in activitypub/followers_synchronizations controller ( #28820 )
2024-01-22 13:55:37 +00:00
5fc4ae7c5f
Move privacy policy into markdown file ( #28699 )
2024-01-19 11:22:23 +00:00
1480573c83
Add `Account.auditable` scope, fix N+1 in admin/action_logs#index ( #28812 )
2024-01-19 01:39:30 +00:00
528a8fa495
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
2024-01-18 22:16:16 +01:00
f866413e72
Extract shared tagged statuses method in `FeaturedTag` ( #28805 )
2024-01-18 16:14:15 +00:00
d0b3bc23d7
Remove unused `matches_domain` scopes on Account, DomainAllow, DomainBlock ( #28803 )
2024-01-18 16:11:04 +00:00
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
9fb9ef418a
Fix `Rails/WhereExists` cop in User model ( #28792 )
2024-01-18 13:55:44 +00:00
aaa6f2e930
Group common `class_name` options in associations ( #28779 )
2024-01-18 12:29:41 +00:00
da31792ac7
Fix `Rails/WhereExists` cop in FeaturedTag model ( #28791 )
2024-01-18 12:22:12 +00:00
89c9a4502d
Fix `Rails/WhereExists` cop in account/interactions concern ( #28789 )
2024-01-18 09:36:16 +00:00
c59fb65ddc
Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to glitch-soc's option to hide followers count.
Ported upstream changes.
Additional changes:
- `app/views/application/mailer/_account.html.haml`:
Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
Ported the `frontend_asset_url` helper change to glitch-soc.
2024-01-17 18:32:15 +01:00
1b0cb3b54d
Announcement reactions query spec improvement and refactor ( #28768 )
2024-01-17 09:18:13 +00:00
278597c161
Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream
2024-01-15 20:53:16 +01:00
2f521bc84a
Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
2024-01-15 20:27:41 +01:00
464051c2d2
Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream
2024-01-15 20:06:31 +01:00
98b5f85f10
Rename and refactor `User#confirm!` to `User#mark_email_as_confirmed!` ( #28735 )
2024-01-15 18:04:58 +00:00
e621c1c44c
Fix registrations not checking MX records for email domain blocks requiring approval ( #28608 )
2024-01-15 17:10:57 +00:00
a2f02a0775
Disable `Rails/SkipsModelValidations` cop ( #28712 )
2024-01-15 13:46:47 +00:00
8cb4825c8b
Fix sign-up restrictions based on email addresses not being enforced ( #28732 )
2024-01-15 11:06:48 +00:00
a90c134850
Move followable by logic to suggestion class ( #28710 )
2024-01-12 13:09:33 +00:00
23d8bd8ce1
Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream
2024-01-11 13:24:20 +01:00
630b245bb4
Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
Removed upstream, while glitch-soc had a change related to its theming system.
Removed as well, as it's unused.
2024-01-11 12:59:27 +01:00
47d213e701
Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream
2024-01-10 18:41:04 +01:00
0b2c7cdb02
Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
environment variable.
Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
2024-01-10 17:51:12 +01:00
543d7890fd
Use normalizes to prepare `User` values ( #28650 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 13:36:06 +00:00
10203bd57a
Clean up `Setting` model and remove dead code ( #28661 )
2024-01-09 14:01:53 +00:00
1781849884
Inline what remains of the rails-settings-cached gem ( #28618 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-09 11:50:21 +00:00
cd4b4d4734
Replace unused `by_recent_sign_in` scope ( #28616 )
2024-01-08 15:31:13 +00:00
e677eb164c
Remove unused `Announcement#time_range?` ( #28648 )
2024-01-08 15:26:30 +00:00
3e43cd095c
Remove unused scope `Announcement.without_muted` ( #28645 )
2024-01-08 15:26:14 +00:00
Claire
Emelia Smith
JS Moore
Matt Jankowski
Eugen Rochko
Jean Boussier