Claire
4d4611beba
Merge commit 'e8045de79bf0b445f43a7b7b7e5b38919edd93f6' into glitch-soc/merge-4.5
2026-02-03 15:33:46 +01:00
Claire
e8045de79b
Bump version to v4.5.6 ( #37715 )
2026-02-03 15:26:52 +01:00
Claire
ada1d32394
Merge commit 'db943c43c8fe834a0db6e87c020783ecf42476a9' into glitch-soc/merge-4.5
2026-01-20 15:56:06 +01:00
Claire
db943c43c8
Bump version to v4.5.5 ( #37546 )
2026-01-20 15:53:37 +01:00
Claire
b5d868018d
Merge commit '55a7b1ea5820b2fa8d754108b6a948d4bd60d98b' into glitch-soc/merge-4.5
2026-01-07 14:25:37 +01:00
Claire
55a7b1ea58
Bump version to v4.5.4 ( #37409 )
2026-01-07 14:23:34 +01:00
Claire
6c1e892dd7
Merge commit '86cff1abca6af7ffb1a6ca004ae308c0df6d45ba' into glitch-soc/merge-4.5
2025-12-08 16:37:11 +01:00
Claire
86cff1abca
Bump version to v4.5.3 ( #37142 )
2025-12-08 16:20:15 +01:00
Matt Jankowski
a04a210e14
Suggest ES image version 7.17.29 in docker compose ( #36972 )
2025-12-05 11:15:16 +01:00
Claire
b35c691ab2
Merge commit '19588756ef62847a01486fa360d4e4ee00307948' into glitch-soc/merge-4.5
2025-11-20 14:49:19 +01:00
Claire
19588756ef
Bump version to v4.5.2 ( #36944 )
2025-11-20 14:41:09 +01:00
Claire
585827c14f
Merge commit 'bb6093c3153f092736e2f25959e3dcdceeb7bce1' into glitch-soc/merge-4.5
2025-11-13 17:22:33 +01:00
Claire
bb6093c315
Bump version to v4.5.1
2025-11-13 17:12:07 +01:00
Claire
3ca92c4ae2
Merge commit '26c78392f88afccebb8a88b68bc9994a9ce12648' into glitch-soc/merge-4.5
2025-11-06 12:49:01 +01:00
Claire
26c78392f8
Bump version to v4.5.0 ( #36732 )
2025-11-06 12:39:07 +01: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
3a31ef11cc
Merge commit 'db0cd9489c70e985da961a585f3a809ca449dccf' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/post_status_service.rb`:
Upstream updated the logic to move the CW to the text content.
Glitch-soc does not move CW to text content but has some logic
to avoid the text being empty. Update the logic according to upstream's
change.
- `docker-compose.yml`:
Conflict because of different paths for composer images.
Updated version as upstream did while keeping our path.
2025-09-17 20:10:28 +02:00
Claire
db0cd9489c
Bump version to v4.4.4 ( #36152 )
2025-09-17 12:19:03 +00:00
Claire
3f166bb068
Merge commit 'ffeb5da9912a3b7db0deb8aec429e661ef609c59' into glitch-soc/merge-upstream
2025-08-05 15:46:33 +02:00
Claire
ffeb5da991
Bump version to v4.4.3 ( #35687 )
2025-08-05 13:32:20 +00:00
Claire
72affd6b45
Merge commit 'a863e68d174b176dc350d8e3472c010cd37b7807' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends/statuses.rb`:
Conflict because of glitch-soc's setting to allow CWs in trends.
Kept glitch-soc's setting but followed upstream's refactor.
- `docker-compose.yml`:
Conflict because of upstream VS glitch-soc repos.
Updated version number as upstream did, but kept glitch-soc repos.
2025-07-24 18:10:38 +02:00
David Roetzel
7d136feccf
Bump version to v4.4.2 ( #35498 )
2025-07-24 07:51:56 +00:00
Claire
e2a867507c
Merge commit 'e9170e2de1d75e02f04ad39f2af131c70189fb50' into glitch-soc/merge-upstream
2025-07-10 01:10:32 +02:00
Claire
e9170e2de1
Bump version to v4.4.1 ( #35329 )
2025-07-09 16:22:25 +00:00
Claire
f7d1d73073
Merge commit 'b628a98d323902cdcc08fb8d612887dff4dbcd89' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a new user setting, directly next to a glitch-soc-only one.
The upstream setting would actually replace the glitch-soc one but it is not
fully implemented yet, so have them side by side now.
- `app/views/settings/preferences/appearance/show.html.haml`:
Ditto.
- `docker-compose.yml`:
Conflict due to different registry names. Updated the version while keeping
glitch-soc's registry.
2025-07-08 17:27:19 +02:00
Claire
b628a98d32
Bump version to v4.4.0 ( #35291 )
2025-07-08 14:26:43 +00:00
Claire
088af860b3
Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream
2025-06-02 12:16:06 +02:00
Lukas Martini
11481df4dc
Fix sidekiq health check in docker-compose for sidekiq 7 ( #34879 )
2025-06-02 07:48:37 +00:00
Claire
49e9a1fe4e
Merge commit 'fbe9728f36998d3788e71c56bacc803c857fc422' into glitch-soc/merge-upstream
...
Conflicts:
- `docker-compose.yml`:
Conflict because of different repo names. Updated version.
2025-05-06 16:30:33 +02:00
Claire
fbe9728f36
Bump version to v4.3.8 ( #34626 )
2025-05-06 14:17:07 +00:00
Claire
62237332ed
Switch to glitch-soc docker images in docker-compose ( #3038 )
...
Fixes #3032
2025-04-12 11:49:22 +02:00
Claire
264ecdcc13
Bump version to v4.3.7 ( #34385 )
2025-04-07 09:31:00 +00:00
Claire
7866745a6b
Bump version to v4.3.6 ( #34167 )
2025-03-13 14:27:20 +00:00
Claire
fb34d9c590
Bump version to v4.3.5 ( #34129 )
2025-03-10 17:00:15 +00:00
Claire
cfb473c204
Bump version to v4.4.0-alpha.3 ( #34022 )
2025-02-27 15:32:15 +00:00
Mikkel Ricky
2bfcda172d
Fix documentation URL ( #33728 )
2025-01-27 08:23:53 +00:00
Claire
0aa9bb8130
Bump version to v4.4.0-alpha.2 ( #33615 )
2025-01-16 11:02:54 +00:00
Noel De Martin
5c4e224b66
Comment sidekiq build in docker compose ( #33483 )
2025-01-07 15:40:24 +00:00
Claire
ab133c5e30
Bump version to v4.3.2 ( #33226 )
2024-12-09 09:09:00 +00:00
Claire
e97f4b18ad
Update changelog and docker tags to v4.3.1 ( #32849 )
2024-11-12 08:54:18 +00:00
Claire
c3a38c7d8c
Update changelog and security policy ( #32300 )
2024-10-08 12:24:59 +00:00
Claire
03210085b7
Bump version to 4.3.0-rc.1 ( #32124 )
2024-09-30 10:42:59 +00:00
Claire
3e91c101b3
Bump version to 4.3.0-beta.2 ( #31948 )
2024-09-17 15:42:45 +00:00
