me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
39755 commits 2 branches 0 tags 429 MiB
Commit graph

39755 commits

This branch
This branch
All branches
Author SHA1 Message Date
alfe
b5c5e2bf36 Rewrite <ShortNumber /> as FC and TS (#25492) 2023-07-08 11:11:58 +02:00
alfe
20e85c0e83
Rewrite <ShortNumber /> as FC and TS (#25492) 2023-07-08 11:11:58 +02:00
fusagiko / takayamaki
4106a801a0 simplify counters (#25541) 2023-07-08 11:11:22 +02:00
fusagiko / takayamaki
e0d230fb37
simplify counters (#25541) 2023-07-08 11:11:22 +02:00
Matt Jankowski
3f04f0c37b Regenerate brakeman ignore, pruning warnings (#25749) 2023-07-08 11:07:19 +02:00
Matt Jankowski
0f9b803eb3
Regenerate brakeman ignore, pruning warnings (#25749) 2023-07-08 11:07:19 +02:00
Ariadne Conill
2c4116a936 th: Merge pull request 'merge-2023-07-07' (#63) from merge-2023-07-07 into main 
Reviewed-on: https://gitea.treehouse.systems/treehouse/mastodon/pulls/63
 2023-07-07 22:13:35 +00:00
Renaud Chaput
7ff696d848 Fix translate button position (#25807) 2023-07-08 00:12:31 +02:00
Renaud Chaput
9f078e238d
Fix translate button position (#25807) 2023-07-08 00:12:31 +02: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
Claire
db11493851 Merge pull request #2279 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-07 20:33:32 +02:00
Claire
a40529fa79
Merge pull request #2279 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-07 20:33:32 +02:00
Claire
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
Claire
b9aa228c54 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
Claire
784f7fb497 Bump version to v4.1.4 (#25805) 2023-07-07 19:42:03 +02:00
Claire
0051128387
Bump version to v4.1.4 (#25805) 2023-07-07 19:42:03 +02:00
Renaud Chaput
6b6774341d Tag images with the latest tag only when running against the latest stable branch (#25803) 2023-07-07 19:31:55 +02:00
Renaud Chaput
d481e72e85
Tag images with the latest tag only when running against the latest stable branch (#25803) 2023-07-07 19:31:55 +02:00
Claire
9a0cbecd67 Fix crash in admin interface when viewing a remote user with verified links (#25796) 2023-07-07 18:10:17 +02:00
Claire
b6d173b459
Fix crash in admin interface when viewing a remote user with verified links (#25796) 2023-07-07 18:10:17 +02:00
Claire
d979d9fe49 Fix branding:generate_app_icons failing because of disallowed ICO coder (#25794) 2023-07-07 18:10:00 +02:00
Claire
71d44949bf
Fix branding:generate_app_icons failing because of disallowed ICO coder (#25794) 2023-07-07 18:10:00 +02:00
nemobis
86c00c14a5 Fix typo in CHANGELOG.md (#25764) 2023-07-07 14:15:54 +02:00
nemobis
dfedf0ec64
Fix typo in CHANGELOG.md (#25764) 2023-07-07 14:15:54 +02:00
renovate[bot]
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
renovate[bot]
8b624553ef
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
Claire
0b9ced4b0c Fix processing of media files with unusual names (#25788) 2023-07-07 13:35:22 +02:00
Claire
94fbac77e7
Fix processing of media files with unusual names (#25788) 2023-07-07 13:35:22 +02:00
Claire
4c1f5cd847 Fix incorrect secondary button size (#2276) 2023-07-07 09:50:06 +02:00
Claire
513078de7a
Fix incorrect secondary button size (#2276) 2023-07-07 09:50:06 +02:00
Kouhai
0cf9fcd5e9 th: buildkit paralellism? more likely than not 2023-07-06 23:08:07 -07:00
Kouhai
e8fd392a23 th: build more fast 2023-07-06 23:05:23 -07:00
Kouhai
582003873c th: disable bootsnap? 2023-07-06 22:34:54 -07:00
Kouhai
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: https://gitea.treehouse.systems/treehouse/mastodon/pulls/62
 2023-07-06 20:27:32 +00:00
Kouhai
adc5608efc th: force ci 2023-07-06 12:34:15 -07:00
Kouhai
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
Claire
15416cb567 Merge pull request #2274 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-06 15:21:10 +02:00
Claire
c25ba31e95
Merge pull request #2274 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-06 15:21:10 +02:00
Claire
3581e4be49 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-06 15:16:34 +02:00
Claire
ff7aae3037 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-06 15:16:34 +02:00
Claire
8f62bea002 Bump version to v4.1.3 (#25757) 2023-07-06 15:14:42 +02:00
Claire
5e1752ce3f
Bump version to v4.1.3 (#25757) 2023-07-06 15:14:42 +02:00
Claire
dab0be5aed Merge pull request from GHSA-55j9-c3mp-6fcq 2023-07-06 15:06:49 +02:00
Claire
610731b03d
Merge pull request from GHSA-55j9-c3mp-6fcq 2023-07-06 15:06:49 +02:00
Claire
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
Claire
c5929798bf
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
Claire
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
Claire
dc8f1fbd97
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