merge: bump devel version (!486 )

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/486
bump devel version
2024-11-26 23:03:09 +02:00 · 2024-04-03 11:27:21 +00:00 · 2024-03-30 12:48:03 +00:00 · 2024-03-30 12:44:31 +00:00 · 2024-03-30 11:19:08 +00:00 · 2024-03-30 11:09:00 +00:00
3 changed files with 8 additions and 3 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -55,6 +55,8 @@ getImageTag:
  only:
    - stable
    - develop
    - tags
 buildDocker:
  stage: deploy
  needs:
@ -78,6 +80,8 @@ buildDocker:
  only:
    - stable
    - develop
    - tags
 mergeManifests:
  stage: deploy
  needs:
@ -103,3 +107,4 @@ mergeManifests:
  only:
    - stable
    - develop
    - tags
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "sharkey",
-	"version": "2024.3.1",
+	"version": "2024.3.2-devel",
 	"codename": "shonk",
 	"repository": {
 		"type": "git",
Author	SHA1	Message	Date
dakkar	cfa1e4a886	merge: bump `devel` version (!486 ) View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/486	2024-04-03 11:27:21 +00:00
dakkar	2a634e0309	bump devel version	2024-03-30 12:48:03 +00:00
dakkar	e6970a0e7c	Merge branch 'stable' into bump-devel-version	2024-03-30 12:44:31 +00:00
Amelia Yukii	571272a564	merge: release 2024.3.2 (!485 ) View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/485 Approved-by: Amelia Yukii <amelia.yukii@shourai.de>	2024-03-30 11:19:08 +00:00
dakkar	30bb0f60a2	version bump	2024-03-30 11:09:00 +00:00
dakkar	328546c4cd	Merge branch 'develop' into release/2024-03-30	2024-03-30 11:08:26 +00:00
dakkar	2cad97c1ab	merge: release 2024.3.1 (!449 ) View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/449 Approved-by: Amelia Yukii <amelia.yukii@shourai.de> Approved-by: Marie <marie@kaifa.ch>	2024-03-02 17:43:24 +00:00
dakkar	6ecfe7c7c3	remove duplicate method	2024-03-02 17:34:31 +00:00
dakkar	23f476dbf3	Merge branch 'develop' into release/2024.3.1	2024-03-02 17:28:34 +00:00
Amelia Yukii	7a1251423f	merge: Add missing IMPORTANT_NOTES.md from Sharkey/OldJoinSharkey (!443 ) View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/443 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: Amelia Yukii <amelia.yukii@shourai.de>	2024-02-24 18:20:48 +00:00
Marie	7f5492a395	Add missing IMPORTANT_NOTES.md from Sharkey/OldJoinSharkey	2024-02-24 18:20:48 +00:00
Amelia Yukii	11d9fd9199	merge: import upstream ssrf fix on our stable (!425 ) View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/425 Approved-by: Leah <kevinlukej@gmail.com> Approved-by: Amelia Yukii <amelia.yukii@shourai.de>	2024-02-17 13:06:47 +00:00
syuilo	6132bc3b3e	fix of `9a70ce8f5e` Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>	2024-02-17 12:54:45 +00:00
dakkar	fef7a7b99a	bump version	2024-02-17 12:38:01 +00:00
tamaina	1948ca9aa8	Merge pull request from GHSA-qqrm-9grj-6v32	2024-02-17 12:36:44 +00:00
Amelia Yukii	848e1f9a56	version is better (cherry picked from commit `fb455e4fd9`)	2024-02-01 16:11:48 +00:00
Amelia Yukii	9c4353ee79	Update .gitlab-ci.yml (cherry picked from commit `8c5818acf0`)	2024-02-01 16:10:47 +00:00
Amelia Yukii	a6e257f502	Merge branch 'feture/code-injection-fix' into 'develop' CVE: Fixed code injection from twitter import See merge request TransFem-org/Sharkey!390 (cherry picked from commit `127f8556d4`) `2a8e93e4` Fixed code injection from twitter import	2024-02-01 15:07:35 +00:00
Amelia Yukii	310e1a1262	Merge branch 'Amelia-stable-patch-29368' into 'stable' Update docker-compose_example.yml See merge request TransFem-org/Sharkey!389	2024-02-01 14:44:14 +00:00
Amelia Yukii	15f3c046d1	Update docker-compose_example.yml	2024-02-01 14:42:19 +00:00
Amelia Yukii	01d695428a	Revert "build stable with stable tag" This reverts commit `acf3e3460f`	2024-02-01 14:15:10 +00:00
Amelia Yukii	acf3e3460f	build stable with stable tag	2024-02-01 14:00:56 +00:00
Amelia Yukii	4c8116859c	Revert "Merge branch 'cherry-pick-3b2d47b1' into 'stable'" This reverts merge request !386	2024-02-01 13:55:44 +00:00
Amelia Yukii	0e13397db7	Merge branch 'cherry-pick-3b2d47b1' into 'stable' build stable with stable tag See merge request TransFem-org/Sharkey!386	2024-02-01 13:41:34 +00:00
Amelia Yukii	ad8818508f	Update file .gitlab-ci.yml (cherry picked from commit `3b2d47b1e3`)	2024-02-01 13:38:19 +00:00
Amelia Yukii	d444ee662f	Merge branch 'cherry-pick-522ab39d' into 'stable' Merge branch 'gitlab-ci' into 'develop' See merge request TransFem-org/Sharkey!383	2024-02-01 10:23:23 +00:00
Amelia Yukii	4c354fff2d	Merge branch 'gitlab-ci' into 'develop'	2024-02-01 10:23:23 +00:00
Marie	b81448edf6	merge: release 2023.12.0	2023-12-31 23:19:41 +01:00
Marie	134d2895f0	fix: merge conflict	2023-12-31 23:11:15 +01:00
Marie	7ba8fde9b9	chore: change version	2023-12-31 22:49:43 +01:00
Marie	1022280465	release: 2023.11.2	2023-12-01 00:01:19 +01:00
Marie	021d3924e6	chore: change version	2023-11-30 23:57:04 +01:00
Mar0xy	b6d50d781f	Merge branch 'stable' of https://github.com/transfem-org/Sharkey into stable	2023-11-26 18:47:44 +01:00
Mar0xy	1d411bb885	chore: fix locales	2023-11-26 18:47:20 +01:00
Marie	f7afd1ae4a	release: 2023.11.1	2023-11-26 17:28:42 +01:00
Marie	1ef1f2a03c	Merge branch 'stable' into release/2023.11.1	2023-11-26 17:26:30 +01:00
Marie	829ce4f86a	merge: 2023.11.0	2023-11-07 20:16:20 +01:00
Mar0xy	6d5d863150	merge: last minute changes	2023-11-07 20:07:53 +01:00
Marie	fc7d4bc420	chore: set release version	2023-11-07 19:39:18 +01:00