559f7a8e61
[Glitch] Fix media preview height in compose form when 3 or more images are attached ( #2988 )
...
Port 50449ae7ac
2025-03-08 16:13:49 +01:00
1704a7d858
Merge pull request #2980 from glitch-soc/glitch-soc/merge-4.3
...
Merge upstream changes up to c1f398ae93
2025-02-27 16:31:19 +01:00
97fd14e141
Merge commit 'c1f398ae93d23ebb1ff5c7df5a32bc161a632980' into glitch-soc/merge-4.3
2025-02-27 16:21:44 +01:00
c1f398ae93
Bump version to v4.3.4
2025-02-27 16:09:48 +01:00
19b3469c29
Change HTML sanitization to remove unusable and unused `embed` tag ( #34021 )
2025-02-27 16:09:48 +01:00
57e4232b3e
Update dependency `uri`
2025-02-27 16:09:48 +01:00
c6b501c42d
Merge commit from fork
...
* Fix domain blocks/rationales being visible to unapproved/unconfirmed users
* Fix domain blocks/rationales being visible to suspended users
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Allow moved users to view domain blocks
* Add authorization specs for `/api/v1/instance/domain_blocks` spec
* Fix tests
* Fix incorrect test setup
---------
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
2025-02-27 15:49:57 +01:00
5140f31cbb
Merge commit from fork
2025-02-27 15:44:35 +01:00
adee65ad1b
Merge pull request #2976 from glitch-soc/glitch-soc/merge-4.3
...
Merge upstream changes up to b1a584d252
2025-02-25 21:20:39 +01:00
fba7e85b9b
[Glitch] Fix emoji rewrite adding unnecessary curft to the DOM for most emoji
...
Port 44f5f1f0a5
2025-02-25 18:40:30 +01:00
bc95675236
[Glitch] Fix preview card sizing in “Author attribution” in profile settings
...
Port 82e046ea06
2025-02-25 18:39:00 +01:00
ccc4fcbdb8
[Glitch] Fix notification polling showing a loading bar in web UI
...
Port e856838e0c
2025-02-25 18:38:35 +01:00
e3afbab115
[Glitch] Fix accounts table long display name
...
Port 0ad5c212c1
2025-02-25 18:38:12 +01:00
baac429103
Merge commit 'b1a584d252f4df4c2a1a9400d6588b4f36768216' into glitch-soc/merge-4.3
...
Conflicts:
- `app/lib/feed_manager.rb`:
Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
Added upstream's code.
In addition, upstream changed how notifications from follow subscriptions were
handled, refactoring this file in the process.
Ported upstream's changes.
- `app/services/precompute_feed_service.rb`:
Not a real conflict, glitch-soc has extra code for the direct feed.
Added upstream's new code for populating lists.
- `app/validators/poll_options_validator.rb`:
Upstream split `PollValidator` in two, and glitch-soc had local changes to
make the options configurable.
Refactored as upstream did, keeping glitch-soc's configurable limits.
- `app/workers/feed_insert_worker.rb`:
Upstream changed how notifications from follow subscriptions were handled,
refactoring this file in the process.
Conflict is due to glitch-soc having an extra timeline type (direct).
Ported upstream's changes.
2025-02-25 18:33:54 +01:00
b1a584d252
New Crowdin Translations for stable-4.3 (automated) ( #33999 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-02-25 17:12:07 +01:00
8787077462
Fix `GET /api/v2/notifications/:id` and `POST /api/v2/notifications/:id/dismiss` for ungrouped notifications ( #33990 )
2025-02-25 17:11:09 +01:00
10bcbf15af
Update dependency `nokogiri`
2025-02-25 17:11:09 +01:00
fb29ac0f5f
Update dependency `rack`
2025-02-25 17:11:09 +01:00
b0f88be86f
Update dependencies `net-imap`, `net-smtp` and `timeout`
2025-02-25 17:11:09 +01:00
018b85e767
Update dependency ruby-vips
2025-02-25 17:11:09 +01:00
08d2250ad2
Fix handling of duplicate mentions in incoming status `Update` ( #33911 )
2025-02-25 17:11:09 +01:00
679e7555ee
Fix filtering for lists ( #33842 )
2025-02-25 17:11:09 +01:00
452153d55d
Optimize timeline generation ( #33839 )
2025-02-25 17:11:09 +01:00
2954c2facb
Change preview cards to be shown when Content Warnings are expanded ( #33827 )
2025-02-25 17:11:09 +01:00
44e38b79de
Fix emoji rewrite adding unnecessary curft to the DOM for most emoji ( #33818 )
2025-02-25 17:11:09 +01:00
b32a67ff74
Fix `tootctl feeds build` not building list timelines ( #33783 )
2025-02-25 17:11:09 +01:00
4f33b041f0
Fix flaky test in `/api/v2/notifications` tests ( #33773 )
2025-02-25 17:11:09 +01:00
6e906884cf
Fix missing timeout options in `Request` class ( #33769 )
2025-02-25 17:11:09 +01:00
317715254f
Fix incorrect signature after HTTP redirect ( #33757 )
2025-02-25 17:11:09 +01:00
2b148d3e88
Fix polls not being validated on edition ( #33755 )
2025-02-25 17:11:09 +01:00
227d48dbd5
Fix LDSignature tests ( #33705 )
2025-02-25 17:11:09 +01:00
94fed6e140
Change `mastodon:setup` to prevent overwriting already-configured servers ( #33684 )
2025-02-25 17:11:09 +01:00
37b029d400
Move clear environment portion of `mastodon:setup` to private method ( #33616 )
2025-02-25 17:11:09 +01:00
11baa26db2
Collect errors in setup rake task ( #33603 )
2025-02-25 17:11:09 +01:00
c7172b54fe
Change notifications from moderators to not be filtered ( #33654 )
2025-02-25 17:11:09 +01:00
74496838e7
Add `UserRole#bypass_block?` method for notification check ( #32974 )
2025-02-25 17:11:09 +01:00
ca39069433
Further harden the warnings against changing encryption secrets ( #33631 )
2025-02-25 17:11:09 +01:00
7ad9581940
Fix media preview height in compose form when 3 or more images are attached ( #33571 )
2025-02-25 17:11:09 +01:00
e4f2a054c9
Fix preview card sizing in “Author attribution” in profile settings ( #33482 )
2025-02-25 17:11:09 +01:00
68eb62f4a9
Fix processing of incoming notifications for unfilterable types ( #33429 )
2025-02-25 17:11:09 +01:00
e63d0cfe85
Fix intermittent failure on ap/activity/update spec timestamp check ( #33425 )
2025-02-25 17:11:09 +01:00
4da31b8263
Fix intermittent failure on ap/activity/create spec timestamp check ( #33406 )
2025-02-25 17:11:09 +01:00
17695ace33
Fix featured tags for remote accounts not being kept up to date ( #33372 )
2025-02-25 17:11:09 +01:00
fa2625a0d9
Fix notification polling showing a loading bar in web UI ( #32960 )
2025-02-25 17:11:09 +01:00
1005b2f7b2
Fix accounts table long display name ( #29316 )
2025-02-25 17:11:09 +01:00
f24b0e9505
Fix exclusive lists interfering with notifications ( #28162 )
2025-02-25 17:11:09 +01:00
4db64491ee
Merge pull request #2969 from glitch-soc/glitch-soc/merge-4.3
...
Merge upstream changes up to 96455304bc
2025-02-12 20:53:05 +01:00
fd79e2417d
Merge commit '96455304bc0d7157e9db13dba838a641ba42e907' into glitch-soc/merge-4.3
...
- `.github/workflows/build-nightly.yml`:
We had modified the file to disable the custom ARM64 builder.
Upstream has removed it, using github's runners.
Took upstream's changes.
- `.github/workflows/build-push-pr.yml`:
We had modified the file to disable the custom ARM64 builder.
Upstream has removed it, using github's runners.
Took upstream's changes.
- `.github/workflows/build-releases.yml`:
We had modified the file to disable the custom ARM64 builder.
Upstream has removed it, using github's runners.
Took upstream's changes.
- `.github/workflows/build-security.yml`:
We had modified the file to disable the custom ARM64 builder.
Upstream has removed it, using github's runners.
Took upstream's changes.
2025-02-12 20:33:05 +01:00
96455304bc
Use github's native arm64 runners for docker builds ( #33886 )
2025-02-12 11:02:44 +01:00
63f4e2070c
Merge commit 'faed9bf9f14f077443374f5eb3075b9878e24214' into glitch-soc/stable-4.3
2025-01-16 11:43:10 +01:00
Claire