Claire
1403a21fe8
Merge commit 'd74bbd9a3c64740433e016dfc936e83d710858f6' into glitch-soc/merge-4.6
2026-08-13 18:41:35 +02:00
Claire
d74bbd9a3c
Bump version to v4.6.6
2026-08-13 18:16:01 +02:00
Claire
53bad36955
Merge commit '1440d55b139e39ec722c2a3db7f60b66cd889048' into glitch-soc/merge-4.6
2026-08-06 18:09:08 +02:00
Claire
1440d55b13
Bump version to v4.6.5
2026-08-06 14:22:54 +02:00
Claire
2be3994558
Merge commit '930aa9fee26bf9eaefe27826fa1061288d83373b' into glitch-soc/stable-4.6
2026-07-27 16:05:45 +02:00
Claire
930aa9fee2
Merge commit from fork
...
* Fix GHSA-7jvv-fhmg-wpfw
* Fix GHSA-hx34-2pfw-2qfj
* Fix GHSA-vwhj-3g83-v276
* Bump version to v4.6.4
2026-07-27 16:02:01 +02:00
Claire
f8fb62193a
Merge commit 'eeb68053a83894190eefae178a661018b9859494' into glitch-soc/merge-4.6
2026-07-03 18:14:36 +02:00
Claire
eeb68053a8
Bump version to v4.6.3
2026-07-03 15:22:15 +02:00
Claire
42e1446900
Merge commit '70d39d364ba6183a2b6e2f763204fe2c21e0ca42' into glitch-soc/merge-4.6
2026-06-25 11:07:11 +02:00
Claire
70d39d364b
Bump version to v4.6.2
2026-06-25 10:56:15 +02:00
Claire
3083fdad1f
Merge commit '46108ecfe18f53e8a989aa36e9397914f6bc0108' into glitch-soc/merge-4.6
2026-06-24 17:27:19 +02:00
Claire
8fe3dbad2e
Bump version to v4.6.1
2026-06-24 14:48:52 +02:00
Claire
6b4e8c7467
Merge commit 'e8642389912b1059c921f0836825f12a0f2779db' into glitch-soc/merge-4.6
...
Conflicts:
- `app/models/account.rb`:
Upstream changed the display name length limit for local users,
but glitch-soc has a configurable limit.
Updated the default limit to be upstream's new limit.
2026-06-17 14:40:25 +02:00
Claire
e864238991
Bump version to v4.6.0 ( #39470 )
2026-06-17 14:14:09 +02:00
Claire
bbbbb24dbd
Merge commit '96e23af89258068d05cc8557df914b4a9add385b' into glitch-soc/merge-upstream
2026-06-11 13:26:25 +02:00
Shlee and Claire
48d6940d7f
Update docker-compose.yml Elasticsearch image from EOL v7 to slightly newer v8 (investigate v9) ( #36974 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2026-06-11 08:18:37 +00:00
Claire
003ad015f8
Merge commit '0529a1f7d2197dd535f59163c00634f9c060723d' into glitch-soc/merge-upstream
2026-06-03 14:42:51 +02:00
Claire
0529a1f7d2
Bump version to v4.5.11 ( #39264 )
2026-06-03 12:26:55 +00:00
Claire
ca427bc176
Merge commit 'f5b57e8ba7a2d3687b1ae496f6213bfe5347c0fa' into glitch-soc/merge-upstream
2026-05-20 15:43:33 +02:00
Claire
f5b57e8ba7
Bump version to v4.5.10 ( #39104 )
2026-05-20 13:20:08 +00:00
Claire
3072de056a
Merge commit '3a84990780fb1b48999f661f0cea5cb29cca4d33' into glitch-soc/merge-upstream
2026-04-15 16:27:32 +02:00
Claire
3a84990780
Bump version to v4.5.9 ( #38696 )
2026-04-15 14:10:28 +00:00
Claire
3d8e40f7c9
Merge commit 'c72ca33fac1ae1518371f5954ae9487692b17709' into glitch-soc/merge-upstream
2026-03-24 17:05:53 +01:00
Claire
c72ca33fac
Bump version to v4.5.8 ( #38374 )
2026-03-24 15:51:03 +00:00
Claire
c15c49b5b6
Merge commit '1e87bd178d96ab7d760f019fcf651ecc1585e701' into glitch-soc/merge-upstream
2026-02-24 15:14:25 +01:00
Claire
1e87bd178d
Bump version to v4.5.7 ( #37965 )
2026-02-24 13:54:33 +00:00
Claire
13499168f8
Merge commit 'c48634cf5f3c5b50fcf6ea075121fa2d88e07c0e' into glitch-soc/merge-upstream
2026-02-03 15:44:04 +01:00
Claire
c48634cf5f
Bump version to v4.5.6 ( #37722 )
2026-02-03 14:28:23 +00:00
Claire
5d04c56c48
Merge commit '400c1f3e8ec0ffd33ad30d9334b9210cdb89b14c' into glitch-soc/merge-upstream
2026-01-20 16:14:14 +01:00
Claire
400c1f3e8e
Bump version to v4.5.5 ( #37551 )
2026-01-20 15:00:10 +00:00
Claire
aa6ec435d2
Merge commit '9fe14a30724e18425aedaba59ca63c63d8b14083' into glitch-soc/merge-upstream
2026-01-07 14:53:51 +01:00
Claire
9fe14a3072
Bump version to v4.5.4 ( #37413 )
2026-01-07 13:40:06 +00:00
Claire
17ba99e5de
Merge commit 'd6f2a3ac8d61e0828a17f68a6e9094d0f4662f4c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
Conflict because of glitch-soc's theming change.
Adapted upstream's changes.
- `docker-compose.yml`:
Conflict because of container repo name change.
Adapted upstream's changes.
- `yarn.lock`:
Conflict because of an additional glitch-soc dependency.
Updated the dependencies upstream did.
2025-12-10 18:05:44 +01:00
Claire
d6f2a3ac8d
Bump version to v4.5.3 ( #37166 )
2025-12-10 16:42:19 +00:00
Claire
652ed7ab50
Merge commit '585545d0d5678a6ea4b958af4a3bc6593134d0f6' into glitch-soc/merge-upstream
2025-11-21 19:33:14 +01:00
Matt Jankowski
6151febd73
Suggest ES image version 7.17.29 in docker compose ( #36972 )
2025-11-21 09:16:50 +00:00
Claire
dd7d750f5d
Merge commit '21ce99f746e17867df74029d3b2caca45588818d' into glitch-soc/merge-upstream
2025-11-20 18:13:37 +01:00
Claire
21ce99f746
Bump version to v4.5.2 ( #36968 )
2025-11-20 15:04:22 +00:00
Claire
e0d7230f97
Merge commit 'c87b05282909383353a9561e97b9f18a2db0766d' into glitch-soc/merge-upstream
2025-11-14 18:19:00 +01:00
Claire
0d7c23469b
Bump version to v4.5.1 ( #36872 )
2025-11-14 10:43:08 +00:00
Claire
152505dd9e
Merge commit '6f1a30c4a6ea49ff7935f19f5a2cefab3eee9e7c' into glitch-soc/merge-upstream
2025-11-06 14:43:18 +01:00
Claire
6f1a30c4a6
Bump version to v4.5.0 ( #36754 )
2025-11-06 13:24:58 +00:00
Claire
5674100f0b
Merge commit '118ff13bd028cfb19370a12edb9307ea96007ad7' into glitch-soc/merge-upstream
2025-10-21 15:57:43 +02:00
Claire
118ff13bd0
Bump version to v4.5.0-beta.2 ( #36543 )
2025-10-21 13:43:38 +00:00
Claire
f56fc1bab4
Merge commit '241ad1c5878161f5f4a19c16ed6c042f1c2cb6c2' into glitch-soc/merge-upstream
2025-10-16 18:36:25 +02:00
Claire
241ad1c587
Update docker-compose.yml sidekiq health check to work for both 4.4 and 4.5 ( #36498 )
2025-10-16 09:24:22 +00:00
Claire
ef413ef713
Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream
2025-10-15 16:35:37 +02:00
Claire
3160f5746d
Bump version to v4.4.7 ( #36478 )
2025-10-15 09:11:03 +00:00
Claire
be762da45f
Merge commit '254fff93ca3604438a94a453bedfe6f499e2cd66' into glitch-soc/merge-upstream
2025-10-13 16:51:40 +02:00
Claire
254fff93ca
Bump version to v4.4.6 ( #36447 )
2025-10-13 14:31:12 +00:00
Claire
ShleeandClaire
Matt Jankowski