Ariadne Conill
2c4116a936
th: Merge pull request 'merge-2023-07-07' ( #63 ) from merge-2023-07-07 into main
...
Reviewed-on: #63
2023-07-07 22:13:35 +00:00
Ariadne Conill
65288d95b8
th: Merge gitea.treehouse.systems:mirrors/mastodon-glitch into merge-2023-07-07
2023-07-07 21:57:32 +00:00
Ariadne Conill
2829c732f6
th: Merge gitea.treehouse.systems:mirrors/mastodon-glitch into merge-2023-07-07
2023-07-07 21:56:29 +00:00
db11493851
Merge pull request #2279 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-07 20:33:32 +02:00
9ba89aeeb5
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream attempted something with tags.
Kept our version.
2023-07-07 19:59:43 +02:00
784f7fb497
Bump version to v4.1.4 ( #25805 )
2023-07-07 19:42:03 +02:00
6b6774341d
Tag images with the latest tag only when running against the latest stable branch ( #25803 )
2023-07-07 19:31:55 +02:00
9a0cbecd67
Fix crash in admin interface when viewing a remote user with verified links ( #25796 )
2023-07-07 18:10:17 +02:00
d979d9fe49
Fix branding:generate_app_icons failing because of disallowed ICO coder ( #25794 )
2023-07-07 18:10:00 +02:00
86c00c14a5
Fix typo in CHANGELOG.md ( #25764 )
2023-07-07 14:15:54 +02:00
4713b2e0b2
Update dependency sanitize to v6.0.2 [SECURITY] ( #25777 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-07 13:35:54 +02:00
0b9ced4b0c
Fix processing of media files with unusual names ( #25788 )
2023-07-07 13:35:22 +02:00
4c1f5cd847
Fix incorrect secondary button size ( #2276 )
2023-07-07 09:50:06 +02:00
kouhai dev
0cf9fcd5e9
th: buildkit paralellism? more likely than not
2023-07-06 23:08:07 -07:00
kouhai dev
e8fd392a23
th: build more fast
2023-07-06 23:05:23 -07:00
kouhai dev
582003873c
th: disable bootsnap?
2023-07-06 22:34:54 -07:00
kouhai dev
1a7cf76661
th: fix js quote issue
2023-07-06 22:33:05 -07:00
Ariadne Conill
04bcf42d17
th: Merge pull request 'Incorporate glitch changes as of 2023-07-06' ( #62 ) from test-merge-2023-07-04 into main
...
Reviewed-on: #62
2023-07-06 20:27:32 +00:00
kouhai dev
adc5608efc
th: force ci
2023-07-06 12:34:15 -07:00
kouhai dev
234f7cc84e
th: Merge remote-tracking branch 'glitch/main'
...
fixes: CVE-2023-36459
fixes: CVE-2023-36460
fixes: CVE-2023-36461
fixes: CVE-2023-36462
fixes: GHSA-55j9-c3mp-6fcq
fixes: GHSA-9928-3cp5-93fm
fixes: GHSA-9pxv-6qvf-pjwc
fixes: GHSA-ccm4-vgcc-73hp
2023-07-06 12:12:21 -07:00
15416cb567
Merge pull request #2274 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-06 15:21:10 +02:00
3581e4be49
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-06 15:16:34 +02:00
8f62bea002
Bump version to v4.1.3 ( #25757 )
2023-07-06 15:14:42 +02:00
dab0be5aed
Merge pull request from GHSA-55j9-c3mp-6fcq
2023-07-06 15:06:49 +02:00
d7ed682130
Merge pull request from GHSA-9pxv-6qvf-pjwc
...
* Fix timeout handling of outbound HTTP requests
* Use CLOCK_MONOTONIC instead of Time.now
2023-07-06 15:06:23 +02:00
3445bdfa45
Merge pull request from GHSA-9928-3cp5-93fm
...
* Fix attachments getting processed despite failing content-type validation
* Add a restrictive ImageMagick security policy tailored for Mastodon
* Fix misdetection of MP3 files with large cover art
* Reject unprocessable audio/video files instead of keeping them unchanged
2023-07-06 15:05:05 +02:00
96dcfa9745
Merge pull request from GHSA-ccm4-vgcc-73hp
...
* Tighten allowed HTML in oEmbed-based preview cards
* Sanitize preview cards at render time
* Add `sandbox` attribute to preview card iframes
2023-07-06 15:03:33 +02:00
5154acdb9f
Add hardened headers to user-uploaded files ( #25756 )
2023-07-06 14:31:37 +02:00
kouhai dev
547d0e1ba4
th: reduce ci clone depth
2023-07-06 02:47:21 -07:00
kouhai dev
c436a17459
th: quieter yarn please
...
yarn cache logs make woodpecker webui lag. this is not ideal.
2023-07-06 02:47:21 -07:00
41d0d67835
Merge pull request #2272 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-05 16:47:23 +02:00
3676bc46da
[Glitch] Fix regression of icon button colors in web UI
...
Port 12c6337c96
2023-07-05 13:31:26 +02:00
fa02ad3b8c
[Glitch] Change button colors to increase hover/focus contrast and consistency
...
Port 5f31104e1f
2023-07-05 13:30:52 +02:00
c66faebe43
[Glitch] Add button to see results for polls in web UI
...
Port 5b05451744
2023-07-05 12:42:24 +02:00
7747947353
[Glitch] Add canonical link tags in web UI
...
Port 90911f4396
2023-07-05 12:41:52 +02:00
0003a22bc1
[Glitch] Fix local live feeds does not expand
...
Port f3ca8aede9
2023-07-05 12:39:46 +02:00
136ed77764
[Glitch] Add at-symbol prepended to mention span title
...
Port 7731fbbba7
2023-07-05 12:38:54 +02:00
5b328d07e6
[Glitch] Change labels of live feeds tabs in web UI
...
Port 80fee1403f
2023-07-05 12:37:37 +02:00
784f2f35bc
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-05 12:01:26 +02:00
90911f4396
Add canonical link tags in web UI ( #25715 )
2023-07-05 11:25:27 +02:00
kouhai dev
d0edb9444c
th: run haml-lint on quote haml
2023-07-05 01:50:54 -07:00
kouhai dev
c03ac30374
th: invite limit nonfixited bugs
2023-07-05 01:50:54 -07:00
kouhai dev
419acc1ef7
th: update haml-lint for autocorrect
2023-07-05 01:49:42 -07:00
kouhai dev
93d9e16cfc
th: oops, foreman's back
2023-07-05 01:49:42 -07:00
5b05451744
Add button to see results for polls in web UI ( #25726 )
2023-07-05 10:32:04 +02:00
kouhai dev
fa0f31a8fb
th: merge glitch again (lol)
2023-07-05 01:14:10 -07:00
kouhai dev
7116903afd
th: update ruby
2023-07-05 00:27:37 -07:00
kouhai dev
45dad06f1c
th: update node base docker
2023-07-05 00:24:27 -07:00
kouhai dev
280cf13f59
th: add invite limits behind TH_USE_INVITE_QUOTA
...
TH_USE_INVITE_QUOTA: feature flag
TH_INVITE_MAX_USES: max uses per invite for non-moderators
TH_ACTIVE_INVITE_SLOT_QUOTA: max slots in active invites, including consumed slots
2023-07-05 00:20:28 -07:00
e7cf746cf6
th: add slowest dot network to readme
2023-07-05 00:14:12 -07:00
Ariadne Conill
Claire
kouhai dev