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
68c9f91ccb
Treat non-null but blank account domain as local ( #33576 )
2025-01-14 17:40:55 +00:00
e1d7efadc0
Fix libyaml missing from Dockerfile build stage ( #33591 )
2025-01-14 16:35:58 +00:00
bfe73e153d
Update dependency postcss to v8.5.1 ( #33586 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-14 16:34:26 +00:00
50013b10a5
Add `Status::Visibility` concern to hold visibility logic ( #33578 )
2025-01-14 14:32:57 +00:00
7c56517c7c
Move mastodon version config to `config_for` yml ( #33577 )
2025-01-14 14:32:29 +00:00
87849d739e
Update dependency rspec-github to v3 ( #33589 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-14 14:17:11 +00:00
6356870dae
Update dependency sass to v1.83.4 ( #33585 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-14 14:14:03 +00:00
7b608b41f2
Update dependency @babel/plugin-transform-nullish-coalescing-operator to v7.26.6 ( #33584 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-14 14:13:58 +00:00
e9462960a7
Redirect new users to onboarding ( #33471 )
2025-01-14 13:10:48 +00:00
e2f085e2b2
Use final specification for new WebPush subscriptions in web interface ( #33587 )
2025-01-14 10:42:06 +00:00
a9a8b6b701
Expand coverage of admin/trends/* areas ( #33581 )
2025-01-14 10:27:21 +00:00
4a2813158d
Add support for standard webpush ( #33528 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-01-14 09:14:00 +00:00
ee4edbb94f
New Crowdin Translations (automated) ( #33582 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-14 08:44:58 +00:00
74da9e9281
Fix custom css cache miss ( #33583 )
2025-01-14 08:24:00 +00:00
77a44e61a8
Add enum validation to `DomainBlock#severity` ( #29158 )
2025-01-13 16:05:24 +00:00
f9451c5614
Fix issue with trending order when user has chosen languages ( #33557 )
2025-01-13 14:27:30 +00:00
0db7558822
Fix HTTP 500 on `POST /api/v1/admin/ip_blocks` ( #29308 )
2025-01-13 13:50:58 +00:00
3a762cddf6
Reject announce payload if object is nil ( #33570 )
2025-01-13 13:35:16 +00:00
3c4a83fc62
Remove unused `LanguagePresenter#native_name` ( #33551 )
2025-01-13 12:58:53 +00:00
68d818121d
Switch `webpush` dependency to latest version of Mastodon-maintained fork ( #33572 )
2025-01-13 12:46:32 +00:00
50449ae7ac
Fix media preview height in compose form when 3 or more images are attached ( #33571 )
2025-01-13 11:48:47 +00:00
d517fa5ab7
Change ActivityPub path generation to all happen in `ActivityPub::TagManager` ( #33527 )
2025-01-13 09:39:05 +00:00
53885b0fdb
New Crowdin Translations (automated) ( #33559 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-13 09:13:47 +00:00
99637f2deb
Update dependency ox to v2.14.20 ( #33567 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-13 08:53:56 +00:00
44d9dc4bb0
Update dependency pino-http to v10.4.0 ( #33560 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-13 08:51:46 +00:00
f3f6b65db4
Update dependency @babel/plugin-transform-nullish-coalescing-operator to v7.26.5 ( #33553 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-13 08:47:43 +00:00
f950b97024
Merge pull request #2937 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 34cd7d6585
2025-01-11 10:03:15 +01:00
22c1b6f3ee
Fix `Invite#code` changing value on every save ( #33550 )
2025-01-10 20:34:18 +00:00
0270bd2ee5
[Glitch] Require specific subtype of `formatMessage` in `timeAgoString`
...
Port 6b1ea8dd2c
2025-01-10 20:56:20 +01:00
00f410a089
[Glitch] Fix use of deprecated `Iterable.isIndexed` from immutable
...
Port 1bf6195763
2025-01-10 20:55:27 +01:00
fb48fc4cce
[Glitch] Include time portion in formatted datetimes when provided
...
Port JS part of 15669fcf75
2025-01-10 20:53:48 +01:00
19b9884bb2
[Glitch] Fix preview card sizing in “Author attribution” in profile settings
...
Port 82e046ea06
2025-01-10 20:53:12 +01:00
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
34cd7d6585
Use `config_for` for `Mastodon::Version` metadata/prerelease values ( #33548 )
2025-01-10 15:52:43 +00:00
2cfc2a777a
Add `build_object` method for defaults in `AP::Activity::Create` spec ( #33537 )
2025-01-10 11:59:19 +00:00
4f6edc7596
Use `in_order_of` in `trends/*` classes ( #33531 )
2025-01-10 09:33:07 +00:00
e0f6292492
Update dependency uuid to v11.0.5 ( #33538 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-10 09:12:45 +00:00
a8b0152bc5
Convert `admin/terms_of_service/histories` spec controller->system ( #33534 )
2025-01-10 09:11:57 +00:00
1d680f1941
Update dependency rubocop to v1.70.0 ( #33543 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-10 09:11:17 +00:00
d155763014
Update dependency react-textarea-autosize to v8.5.7 ( #33542 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-10 09:10:58 +00:00
8d4ca95163
Convert `admin/follow_recommendations` spec controller->system ( #33533 )
2025-01-10 09:10:21 +00:00
2499cd01db
Add `duplicate_record` helper to maintenance CLI spec ( #33536 )
2025-01-10 09:04:23 +00:00
4fb3dc0363
Extract `CSS_COLORS` constant for `UserRole` regex validation ( #33532 )
2025-01-10 09:02:48 +00:00
846c89b66e
New Crowdin Translations (automated) ( #33541 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-10 09:00:41 +00:00
f98972e4eb
Use `with_options` for Account `if: :local?` validation group ( #33529 )
2025-01-10 09:00:31 +00:00
54e2030146
Add `AccountWarning#appeal_eligible?` method ( #33526 )
2025-01-09 15:08:39 +00:00
3a4aed9890
Rename `app/helpers/jsonld_helper.rb` to `app/helpers/json_ld_helper.rb` ( #33489 )
2025-01-09 14:39:49 +00:00
9b8d1fb6d1
Add `Account#actor_type_application?` query method ( #33525 )
2025-01-09 14:32:48 +00:00
a8b2b474d7
Add timestamp to all announcements in Web UI ( #18329 )
2025-01-09 14:22:33 +00:00
Claire