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
34cd7d6585
Use config_for for Mastodon::Version metadata/prerelease values ( #33548 )
2025-01-10 15:52:43 +00: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
renovate[bot]
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
Matt Jankowski
a8b0152bc5
Convert admin/terms_of_service/histories spec controller->system ( #33534 )
2025-01-10 09:11:57 +00:00
renovate[bot]
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
renovate[bot]
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
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
4fb3dc0363
Extract CSS_COLORS constant for UserRole regex validation ( #33532 )
2025-01-10 09:02:48 +00:00
github-actions[bot]
846c89b66e
New Crowdin Translations (automated) ( #33541 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-10 09:00:41 +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
3a4aed9890
Rename app/helpers/jsonld_helper.rb to app/helpers/json_ld_helper.rb ( #33489 )
2025-01-09 14:39:49 +00:00
Matt Jankowski
9b8d1fb6d1
Add Account#actor_type_application? query method ( #33525 )
2025-01-09 14:32:48 +00:00
Claire
a8b2b474d7
Add timestamp to all announcements in Web UI ( #18329 )
2025-01-09 14:22:33 +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
renovate[bot]
51a92427ce
Update dependency react-intl to v7 ( #32954 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-09 10:04:14 +00:00
renovate[bot]
b0fbb71759
Update dependency jsdom to v26 ( #33521 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-09 09:55:34 +00:00
Christian Schmidt
8e2c642d44
Do now swallow response body on persistent connection ( #32729 )
2025-01-09 08:35:35 +00:00
github-actions[bot]
4e2c15b45d
New Crowdin Translations (automated) ( #33522 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-09 08:21:47 +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
Christian Schmidt
1ce2dc3d13
Target same browsers in development and production ( #33513 )
2025-01-09 08:09:13 +00:00
Claire
10e24113a8
Fix issue with “Translate” button being overlayed on text ( #2935 )
...
Fixes #2932
2025-01-08 18:25:09 +01:00
Claire
dc14695f8a
Fix extraneous margins below CW in absence of mentions ( #2936 )
2025-01-08 18:24:57 +01:00
renovate[bot]
3c7f3b190c
Update formatjs monorepo ( #32774 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-08 16:53:12 +00:00
Claire
6b1ea8dd2c
Require specific subtype of formatMessage in timeAgoString ( #33511 )
2025-01-08 16:26:54 +00:00
Claire
1bf6195763
Fix use of deprecated Iterable.isIndexed from immutable ( #33510 )
2025-01-08 16:25:41 +00:00
Matt Jankowski
78e0d6a11a
Extract development section from top-level readme into standalone doc ( #33328 )
2025-01-08 14:29:32 +00:00
Matt Jankowski
f22a2aab40
Add Account#remote? query method ( #33508 )
2025-01-08 14:28:08 +00:00
Emelia Smith
15669fcf75
Include time portion in formatted datetimes when provided ( #33191 )
2025-01-08 14:26:08 +00:00
Lamparter
2c36283a89
Refresh README.md ( #32143 )
2025-01-08 14:03:21 +00:00
renovate[bot]
d34e9eaf17
Update dependency @reduxjs/toolkit to v2.5.0 ( #33102 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-08 14:02:07 +00:00
renovate[bot]
a16d83ffef
Update Node.js to 22.13 ( #33502 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-08 12:22:44 +00:00
Nick Schonning
67a8d4638c
Unpin peter-evans/create-pull-request to v7 ( #30817 )
2025-01-08 11:01:51 +00:00
renovate[bot]
6a351e2247
Update dependency core-js to v3.40.0 ( #33504 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-08 10:57:40 +00:00
renovate[bot]
5a142060e1
Update opentelemetry-ruby (non-major) ( #33506 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-08 10:47:39 +00:00
renovate[bot]
242221c11f
Update dependency connection_pool to v2.5.0 ( #33503 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-08 10:21:58 +00:00
renovate[bot]
ee1cbda226
Update opentelemetry-ruby (non-major) ( #33501 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-08 09:06:37 +00:00
github-actions[bot]
35e57138f1
New Crowdin Translations (automated) ( #33500 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-08 09:01:28 +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
renovate[bot]
c3fc12c2b4
Update dependency rubyzip to v2.4.1 ( #33494 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-08 08:48:51 +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
