Claire
155dc4bc4b
Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream
...
Conflicts:
- `CONTRIBUTING.md`:
Upstream changed the file, while we had a different one.
Updated the common parts.
- `README.md`:
Upstream changed the file, while we had a different one.
Updated the common parts.
- `app/helpers/application_helper.rb`:
Upstream added helpers where glitch-soc had extra ones.
Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
Upstream added some custom handling of one setting, while
glitch-soc had additional code.
Ported upstream's code.
- `lib/mastodon/version.rb`:
Upstream moved some things to `config/mastodon.yml`.
Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
I don't know honestly.
2025-01-10 20:41:36 +01:00
Matt Jankowski
2cfc2a777a
Add build_object method for defaults in AP::Activity::Create spec ( #33537 )
2025-01-10 11:59:19 +00:00
Matt Jankowski
4f6edc7596
Use in_order_of in trends/* classes ( #33531 )
2025-01-10 09:33:07 +00:00
Matt Jankowski
a8b0152bc5
Convert admin/terms_of_service/histories spec controller->system ( #33534 )
2025-01-10 09:11:57 +00:00
Matt Jankowski
8d4ca95163
Convert admin/follow_recommendations spec controller->system ( #33533 )
2025-01-10 09:10:21 +00:00
Matt Jankowski
2499cd01db
Add duplicate_record helper to maintenance CLI spec ( #33536 )
2025-01-10 09:04:23 +00:00
Matt Jankowski
f98972e4eb
Use with_options for Account if: :local? validation group ( #33529 )
2025-01-10 09:00:31 +00:00
Matt Jankowski
54e2030146
Add AccountWarning#appeal_eligible? method ( #33526 )
2025-01-09 15:08:39 +00:00
Matt Jankowski
9b8d1fb6d1
Add Account#actor_type_application? query method ( #33525 )
2025-01-09 14:32:48 +00:00
Claire
c6c8e7e6ab
Fix last paginated notification group only including data on a single notification ( #33271 )
2025-01-09 13:47:12 +00:00
Claire
91c75a6361
Re-introduce application_id in ScheduledStatusSerializer ( #33505 )
2025-01-09 13:38:23 +00:00
Christian Schmidt
8e2c642d44
Do now swallow response body on persistent connection ( #32729 )
2025-01-09 08:35:35 +00:00
Matt Jankowski
cbae00ad23
Remove render_template from accounts request spec ( #33519 )
2025-01-09 08:17:11 +00:00
Matt Jankowski
4148b68430
Remove render_template from remote interaction helper request spec ( #33518 )
2025-01-09 08:17:06 +00:00
Matt Jankowski
f4b463ecb1
Use response.parsed_body for error view application controller spec ( #33515 )
2025-01-09 08:17:00 +00:00
Matt Jankowski
ce1501c3a7
Add "Account::Search" shared example for use in Account spec ( #33507 )
2025-01-09 08:12:48 +00:00
Matt Jankowski
f22a2aab40
Add Account#remote? query method ( #33508 )
2025-01-08 14:28:08 +00:00
Matt Jankowski
0c690511c2
Convert auth/challenges spec controller->request ( #33495 )
2025-01-08 08:54:08 +00:00
Matt Jankowski
b6c2923cf7
Convert settings/migration spec controller->system ( #33496 )
2025-01-08 08:53:26 +00:00
Matt Jankowski
c0264c8013
Extend custom CSS cache time with digest paths ( #33207 )
2025-01-08 08:48:45 +00:00
Matt Jankowski
b3243ef41c
Refer to constant values from api/v1/apps request spec ( #33488 )
2025-01-07 16:28:54 +00:00
Matt Jankowski
7ad44e22ed
Remove role color highlighting from custom css ( #33493 )
2025-01-07 16:28:35 +00:00
Matt Jankowski
efcd4ea5de
Reference value constants from specs ( #33479 )
2025-01-06 23:25:13 +00:00
Claire
126ce9a232
Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream
2025-01-06 20:36:25 +01:00
Matt Jankowski
82d2ce293d
Convert admin/warning_presets spec controller->system ( #33474 )
2025-01-06 18:24:54 +00:00
Matt Jankowski
ef39398b82
Add urgent scope and by_version method to SoftwareUpdate ( #33470 )
2025-01-06 18:23:57 +00:00
Claire
dbbf450ef5
Fix fediverse:creator metadata not showing up in REST API ( #33466 )
2025-01-06 10:04:25 +00:00
Matt Jankowski
08dd11f8d4
Use in_order_of with filter: false in AccountSummary.localized ( #33446 )
2025-01-06 08:18:05 +00:00
zunda
f16fbc069a
Use configured limit for number of profile fields ( #33463 )
2025-01-06 04:47:10 +00:00
Tim Rogers
3bdfa3eb4c
Added validator for extra profile field values with empty name ( #33421 )
2025-01-04 19:42:27 +00:00
Claire
7e1f8babbd
Merge commit '7d6da219c0fccb8693282a99765135050173d7c4' into glitch-soc/merge-upstream
2025-01-03 20:26:28 +01:00
Matt Jankowski
535866218e
Update rails to version 8.0.1 ( #32357 )
2025-01-03 16:08:21 +00:00
Claire
68106f250c
Merge commit '6ffa251d6ad239d1ad2b95e784c3a7a21cbf50e8' into glitch-soc/merge-upstream
2025-01-03 12:34:47 +01:00
Matt Jankowski
7cbdcd7b3f
Add role-specific user fabricators ( #33437 )
2025-01-03 08:28:14 +00:00
Claire
cef665788a
Merge commit '8e3fd1b8236448f01221b1d7745736e50de51e11' into glitch-soc/merge-upstream
2025-01-02 21:14:14 +01:00
Matt Jankowski
8e3fd1b823
Convert disputes/appeals spec controller->system ( #33434 )
2025-01-02 16:08:25 +00:00
Matt Jankowski
1fbd106af9
Convert admin/report_notes spec controller->system ( #33433 )
2025-01-02 15:54:21 +00:00
Matt Jankowski
00a8a5467c
Convert admin/relays spec controller->system ( #33430 )
2025-01-02 15:01:44 +00:00
Matt Jankowski
2e936785b7
Convert admin/rules spec controller->system ( #33377 )
2025-01-02 12:57:55 +00:00
Claire
f9fef9864a
Fix intermittent failure on ap/activity/update spec timestamp check ( #33425 )
2025-01-02 09:17:49 +00:00
Matt Jankowski
441dcd7396
Fix intermittent failure on ap/activity/create spec timestamp check ( #33406 )
2025-01-02 08:38:22 +00:00
Claire
0aa69487a2
Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `config/routes.rb`:
Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
an extra route.
Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
This spec got converted to a system spec upstream.
However, the theme setting works differently in glitch-soc, so the spec had been
changed.
Changed the corresponding system spec as well.
2024-12-25 18:01:37 +01:00
Matt Jankowski
8770905186
Convert admin/ip_blocks spec controller->system ( #33376 )
2024-12-20 15:36:19 +00:00
Matt Jankowski
f35de1ed0d
Remove un-needed Poll.attached scope ( #33368 )
2024-12-20 15:15:11 +00:00
Matt Jankowski
d2fbf42b0e
Avoid validate: false save in expired poll create activity spec ( #33367 )
2024-12-20 13:34:05 +00:00
Claire
344e2903b3
Fix featured tags for remote accounts not being kept up to date ( #33372 )
2024-12-20 11:50:31 +00:00
Matt Jankowski
d31d988e24
Add coverage for UserMailer not delivering to memorialized users ( #33366 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-12-20 10:27:40 +00:00
Matt Jankowski
28d309fd86
Add shared example for Expireable concern ( #33369 )
2024-12-20 08:21:34 +00:00
Matt Jankowski
87c892191a
Convert admin/domain_allows spec controller->system ( #33365 )
2024-12-20 08:04:22 +00:00
Matt Jankowski
1acc54cfc7
Convert admin/webhooks spec controller->system ( #33364 )
2024-12-20 07:52:16 +00:00
