bump `devel` version (!486) · Merge requests · TransFem.org / Sharkey

Merged dakkar requested to merge bump-devel-version into develop 1 year ago

Mar 30, 2024
- bump devel version · 2a634e03
  dakkar authored 1 year ago
  
  2a634e03
- Merge branch 'stable' into bump-devel-version · e6970a0e
  dakkar authored 1 year ago
  
  e6970a0e
- merge: release 2024.3.2 (!485) · 571272a5
  Amelia Yukii authored 1 year ago
```
View MR for information: Sharkey!485



Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
```
  571272a5
- version bump · 30bb0f60
  dakkar authored 1 year ago
  
  30bb0f60
- Merge branch 'develop' into release/2024-03-30 · 328546c4
  dakkar authored 1 year ago
  
  328546c4
Mar 02, 2024
- merge: release 2024.3.1 (!449) · 2cad97c1
  dakkar authored 1 year ago
```
View MR for information: !449



Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
```
  2cad97c1
- remove duplicate method · 6ecfe7c7
  dakkar authored 1 year ago
  
  6ecfe7c7
- Merge branch 'develop' into release/2024.3.1 · 23f476db
  dakkar authored 1 year ago
  
  23f476db
Feb 24, 2024
- merge: Add missing IMPORTANT_NOTES.md from Sharkey/OldJoinSharkey (!443) · 7a125142
  Amelia Yukii authored 1 year ago
```
View MR for information: !443



Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
```
  7a125142
- Add missing IMPORTANT_NOTES.md from Sharkey/OldJoinSharkey · 7f5492a3
  Marie authored 1 year ago
  
  7f5492a3
Feb 17, 2024
- merge: import upstream ssrf fix on our stable (!425) · 11d9fd91
  Amelia Yukii authored 1 year ago
```
View MR for information: !425



Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
```
  11d9fd91
- fix of 9a70ce8f · 6132bc3b
  syuilo authored 1 year ago and dakkar committed 1 year ago
```
Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>
```
  6132bc3b
- bump version · fef7a7b9
  dakkar authored 1 year ago
  
  fef7a7b9
- Merge pull request from GHSA-qqrm-9grj-6v32 · 1948ca9a
  tamaina authored 1 year ago and dakkar committed 1 year ago
  
  1948ca9a
Feb 01, 2024
- version is better · 848e1f9a
  Amelia Yukii authored 1 year ago
```
(cherry picked from commit fb455e4f)
```
  848e1f9a
- Update .gitlab-ci.yml · 9c4353ee
  Amelia Yukii authored 1 year ago
```
(cherry picked from commit 8c5818ac)
```
  9c4353ee
- Merge branch 'feture/code-injection-fix' into 'develop' · a6e257f5
  Amelia Yukii authored 1 year ago
```
CVE: Fixed code injection from twitter import

See merge request !390

(cherry picked from commit 127f8556)

2a8e93e4 Fixed code injection from twitter import
```
  a6e257f5
- Merge branch 'Amelia-stable-patch-29368' into 'stable' · 310e1a12
  Amelia Yukii authored 1 year ago
```
Update docker-compose_example.yml

See merge request TransFem-org/Sharkey!389
```
  310e1a12
- Update docker-compose_example.yml · 15f3c046
  Amelia Yukii authored 1 year ago
  
  15f3c046
- Revert "build stable with stable tag" · 01d69542
  Amelia Yukii authored 1 year ago
```
This reverts commit acf3e346
```
  01d69542
- build stable with stable tag · acf3e346
  Amelia Yukii authored 1 year ago
  
  acf3e346
- Revert "Merge branch 'cherry-pick-3b2d47b1' into 'stable'" · 4c811685
  Amelia Yukii authored 1 year ago
```
This reverts merge request !386
```
  4c811685
- Merge branch 'cherry-pick-3b2d47b1' into 'stable' · 0e13397d
  Amelia Yukii authored 1 year ago
```
build stable with stable tag

See merge request TransFem-org/Sharkey!386
```
  0e13397d
- Update file .gitlab-ci.yml · ad881850
  Amelia Yukii authored 1 year ago
```
(cherry picked from commit 3b2d47b1)
```
  ad881850
- Merge branch 'cherry-pick-522ab39d' into 'stable' · d444ee66
  Amelia Yukii authored 1 year ago
```
Merge branch 'gitlab-ci' into 'develop'

See merge request !383
```
  d444ee66
- Merge branch 'gitlab-ci' into 'develop' · 4c354fff
  Amelia Yukii authored 1 year ago
  
  4c354fff
Dec 31, 2023
- merge: release 2023.12.0 · b81448ed
  Marie authored 1 year ago
  
  b81448ed
- fix: merge conflict · 134d2895
  Marie authored 1 year ago
  
  134d2895
- chore: change version · 7ba8fde9
  Marie authored 1 year ago
  
  7ba8fde9
Nov 30, 2023
- release: 2023.11.2 · 10222804
  Marie authored 1 year ago
  
  Unverified
  
  10222804
- chore: change version · 021d3924
  Marie authored 1 year ago
  
  Unverified
  
  021d3924
Nov 26, 2023
- Merge branch 'stable' of https://github.com/transfem-org/Sharkey into stable · b6d50d78
  Mar0xy authored 1 year ago
  
  Verified
  
  b6d50d78
- chore: fix locales · 1d411bb8
  Mar0xy authored 1 year ago
  
  Verified
  
  1d411bb8
- release: 2023.11.1 · f7afd1ae
  Marie authored 1 year ago
  
  Unverified
  
  f7afd1ae
- Merge branch 'stable' into release/2023.11.1 · 1ef1f2a0
  Marie authored 1 year ago
  
  Unverified
  
  1ef1f2a0
Nov 07, 2023
- merge: 2023.11.0 · 829ce4f8
  Marie authored 1 year ago
  
  Unverified
  
  829ce4f8
- merge: last minute changes · 6d5d8631
  Mar0xy authored 1 year ago
  
  Verified
  
  6d5d8631
- chore: set release version · fc7d4bc4
  Marie authored 1 year ago
  
  Unverified
  
  fc7d4bc4

bump `devel` version

Merge request reports

Activity