b6d249fd0f
Merge branch 'upstream-main' into patches/emoji-reactions-main
2025-01-16 18:23:27 +01:00
Claire
f6a0cd9d1a
Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream
2025-01-16 11:16:53 +01:00
Claire
da4e55eb17
Merge commit from fork
2025-01-16 11:10:08 +01:00
Matt Jankowski
998cf0dd53
Convert auth/setup spec controller->system/request ( #33604 )
2025-01-16 09:03:46 +00:00
Matt Jankowski
72abf05269
Add "needs refresh" scenario to api/v1/polls request spec ( #33608 )
2025-01-16 09:00:04 +00:00
Claire
ad71a8d1f7
Merge commit 'c20824fa760061cf8fba258dbbd6b0a615df4749' into glitch-soc/merge-upstream
2025-01-15 19:32:04 +01:00
Matt Jankowski
9f03e5b53a
Expand coverage of admin/*blocks areas ( #33594 )
2025-01-15 07:47:34 +00:00
Claire
ab152ebed4
Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream refactored `visibility` handling to a concern, while glitch-soc had
custom code adjacent to some of the changed lines.
Applied upstream's changes.
- `lib/mastodon/version.rb`:
Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
default github repository had been modified.
Applied upstream's changes and updated `config/mastodon.yml` accordingly.
2025-01-14 20:38:32 +01:00
Matt Jankowski
68c9f91ccb
Treat non-null but blank account domain as local ( #33576 )
2025-01-14 17:40:55 +00:00
Matt Jankowski
50013b10a5
Add Status::Visibility concern to hold visibility logic ( #33578 )
2025-01-14 14:32:57 +00:00
Matt Jankowski
7c56517c7c
Move mastodon version config to config_for yml ( #33577 )
2025-01-14 14:32:29 +00:00
Matt Jankowski
a9a8b6b701
Expand coverage of admin/trends/* areas ( #33581 )
2025-01-14 10:27:21 +00:00
S1m
4a2813158d
Add support for standard webpush ( #33528 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-01-14 09:14:00 +00:00
Jeong Arm
74da9e9281
Fix custom css cache miss ( #33583 )
2025-01-14 08:24:00 +00:00
Wolfgang
77a44e61a8
Add enum validation to DomainBlock#severity ( #29158 )
2025-01-13 16:05:24 +00:00
Matt Jankowski
f9451c5614
Fix issue with trending order when user has chosen languages ( #33557 )
2025-01-13 14:27:30 +00:00
Daniel M Brasil
0db7558822
Fix HTTP 500 on POST /api/v1/admin/ip_blocks ( #29308 )
2025-01-13 13:50:58 +00:00
Matt Jankowski
3c4a83fc62
Remove unused LanguagePresenter#native_name ( #33551 )
2025-01-13 12:58:53 +00:00
Claire
68d818121d
Switch webpush dependency to latest version of Mastodon-maintained fork ( #33572 )
2025-01-13 12:46:32 +00:00
Claire
d517fa5ab7
Change ActivityPub path generation to all happen in ActivityPub::TagManager ( #33527 )
2025-01-13 09:39:05 +00:00
Matt Jankowski
22c1b6f3ee
Fix Invite#code changing value on every save ( #33550 )
2025-01-10 20:34:18 +00:00
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
