noellabo
5255bd08e0
Add reject pattern to Admin setting (Ported to Glitch Soc)
...
# Conflicts:
# app/views/admin/settings/shared/_links.html.haml
# config/routes/admin.rb
2024-02-17 18:55:57 +01:00
Jeremy Kescher
1c9291adcd
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/styles/components/accounts.scss
# app/javascript/flavours/glitch/styles/components/status.scss
2024-02-14 18:02:38 +01:00
Claire
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
Emelia Smith
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
Emelia Smith
b83076647e
Ignore legacy moderator and admin columns on User model ( #29188 )
2024-02-13 20:03:00 +01:00
Essem
4cbaf46950
Hydrate reactions on streaming API
2024-02-11 17:25:53 +01:00
Jeremy Kescher
40ef7b3849
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/serializers/initial_state_serializer.rb
2024-02-06 22:58:23 +01:00
JS Moore
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
Jeremy Kescher
bf4d613731
Merge branch 'glitch-soc' into develop
2024-01-28 17:56:47 +01:00
Jeremy Kescher
c2c2afc294
Merge branch 'glitch-soc' into develop
2024-01-28 02:29:46 +01:00
Essem
ae854b8027
Port three new emoji reaction PR commits to Catstodon:
...
"Update reaction emails
Reaction icon made by @t3rminus@calamity.world"
"Simplify reactions API controller"
"Refactor status reactions query
This was done to announcement reactions in 1b0cb3b54d
2024-01-28 02:22:43 +01:00
Claire
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
Claire
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
Claire
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
2024-01-25 19:51:19 +01:00
Matt Jankowski
42ab855b23
Add specs for Instance model scopes and add with_domain_follows scope ( #28767 )
2024-01-25 15:28:27 +00:00
Matt Jankowski
6b6586f5d0
Add CustomFilterKeyword#to_regex method ( #28893 )
2024-01-25 13:00:34 +00:00
Claire
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
Matt Jankowski
38f7f8b909
Tidy up association declaration in Instance model ( #28880 )
2024-01-24 17:30:28 +00:00
Matt Jankowski
7a1f087659
Add created_before and updated_before scopes to MediaAttachment ( #28869 )
2024-01-24 10:32:54 +00:00
Matt Jankowski
9d413cbaf8
Fix Rails/WhereExists cop in app/models ( #28863 )
2024-01-24 09:57:49 +00:00
Matt Jankowski
599bc69503
Simplify AccountSummary.filtered query generation ( #28868 )
2024-01-24 09:57:32 +00:00
Eugen Rochko
5b1eb09d54
Add annual reports for accounts ( #28693 )
2024-01-24 09:38:10 +00:00
Matt Jankowski
c0e8e457ab
Eager loading fixes for api/ controllers ( #28848 )
2024-01-23 11:41:54 +00:00
Matt Jankowski
b0207d7757
Add coverage for Tag.recently_used scope ( #28850 )
2024-01-23 09:10:11 +00:00
Claire
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
2024-01-22 19:19:40 +01:00
Claire
0700eb58bc
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream
2024-01-22 19:12:05 +01:00
Matt Jankowski
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
5fc4ae7c5f
Move privacy policy into markdown file ( #28699 )
2024-01-19 11:22:23 +00:00
Matt Jankowski
1480573c83
Add Account.auditable scope, fix N+1 in admin/action_logs#index ( #28812 )
2024-01-19 01:39:30 +00:00
Jeremy Kescher
93ae46fa14
Merge branch 'glitch-soc' into develop
2024-01-18 22:59:27 +01:00
Claire
528a8fa495
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
2024-01-18 22:16:16 +01:00
Matt Jankowski
f866413e72
Extract shared tagged statuses method in FeaturedTag ( #28805 )
2024-01-18 16:14:15 +00:00
Matt Jankowski
d0b3bc23d7
Remove unused matches_domain scopes on Account, DomainAllow, DomainBlock ( #28803 )
2024-01-18 16:11:04 +00:00
Matt Jankowski
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
Matt Jankowski
9fb9ef418a
Fix Rails/WhereExists cop in User model ( #28792 )
2024-01-18 13:55:44 +00:00
Matt Jankowski
aaa6f2e930
Group common class_name options in associations ( #28779 )
2024-01-18 12:29:41 +00:00
Matt Jankowski
da31792ac7
Fix Rails/WhereExists cop in FeaturedTag model ( #28791 )
2024-01-18 12:22:12 +00:00
Matt Jankowski
89c9a4502d
Fix Rails/WhereExists cop in account/interactions concern ( #28789 )
2024-01-18 09:36:16 +00:00
Jeremy Kescher
5d4cfe4cd8
Merge branch 'glitch-soc' into develop
2024-01-17 22:37:29 +01:00
Claire
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
Matt Jankowski
1b0cb3b54d
Announcement reactions query spec improvement and refactor ( #28768 )
2024-01-17 09:18:13 +00:00
Claire
278597c161
Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream
2024-01-15 20:53:16 +01:00
Claire
2f521bc84a
Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
2024-01-15 20:27:41 +01:00
Claire
464051c2d2
Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream
2024-01-15 20:06:31 +01:00
Claire
98b5f85f10
Rename and refactor User#confirm! to User#mark_email_as_confirmed! ( #28735 )
2024-01-15 18:04:58 +00:00
Claire
e621c1c44c
Fix registrations not checking MX records for email domain blocks requiring approval ( #28608 )
2024-01-15 17:10:57 +00:00
Matt Jankowski
a2f02a0775
Disable Rails/SkipsModelValidations cop ( #28712 )
2024-01-15 13:46:47 +00:00
Claire
8cb4825c8b
Fix sign-up restrictions based on email addresses not being enforced ( #28732 )
2024-01-15 11:06:48 +00:00
Jeremy Kescher
c677b8de19
v4.3.0-alpha.0+glitch+cat+1.0.5
2024-01-12 22:03:50 +01:00
Matt Jankowski
a90c134850
Move followable by logic to suggestion class ( #28710 )
2024-01-12 13:09:33 +00:00
