3db8498903
Fix `Style/MutableConstant` cop ( #33602 )
2025-01-16 09:09:06 +00:00
998cf0dd53
Convert `auth/setup` spec controller->system/request ( #33604 )
2025-01-16 09:03:46 +00:00
72abf05269
Add "needs refresh" scenario to `api/v1/polls` request spec ( #33608 )
2025-01-16 09:00:04 +00:00
6394261d58
Merge pull request #2942 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to c20824fa76
2025-01-15 22:20:30 +01:00
ad71a8d1f7
Merge commit 'c20824fa760061cf8fba258dbbd6b0a615df4749' into glitch-soc/merge-upstream
2025-01-15 19:32:04 +01:00
c20824fa76
Promote `Style/WordArray` rule out of todo into main config ( #33580 )
2025-01-15 14:29:14 +00:00
ea01ecd441
Update dependency opentelemetry-instrumentation-rails to v0.34.1 ( #33595 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-15 12:49:12 +00:00
2a0951e987
Update dependency stackprof to v0.2.27 ( #33596 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-15 12:48:52 +00:00
1ae574e32a
Enable parallel execution for linting tasks in HAML workflows ( #33593 )
2025-01-15 07:48:26 +00:00
9f03e5b53a
Expand coverage of `admin/*blocks` areas ( #33594 )
2025-01-15 07:47:34 +00:00
e489410b0f
Fix attachment list in conversation component ( #2941 )
...
`media` is no longer part of `StatusContent`, so the attachment list wasn't shown in the private mentions column.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2025-01-15 08:18:39 +01:00
dc2ce2b305
Merge pull request #2940 from Plastikmensch/fix-media-attachments-in-report-modal
...
Fix media attachments in report modal
2025-01-15 08:17:58 +01:00
5395154832
Fix media attachments in report modal
...
Media attachments weren't shown in the report modal since they were passed as `media` to `StatusContent`, but `StatusContent` doesn't use the media prop anymore.
Instead match the file with vanilla.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2025-01-14 23:47:09 +01:00
ae49d73f58
Merge pull request #2939 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to e1d7efadc0
2025-01-14 21:53:41 +01:00
09bd5aa156
[Glitch] Redirect new users to onboarding
...
Port e9462960a7
2025-01-14 20:47:40 +01:00
563ff91cf8
[Glitch] Use final specification for new WebPush subscriptions in web interface
...
Port e2f085e2b2
2025-01-14 20:46:21 +01:00
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
Matt Jankowski
Claire
renovate[bot]
fusagiko / takayamaki
Plastikmensch
Michael Stanclift
S1m
github-actions[bot]
Jeong Arm
Wolfgang
Daniel M Brasil
Jonathan de Jong
Emelia Smith