WIP: Import bottin et utilise ses configs #145

Draft

ariasat wants to merge 6 commits from New_Bottin into main

ariasat commented

2026-05-01 15:58:19 -04:00

Member

closes #80
closes #79
closes #78
closes #76

closes #80 closes #79 closes #78 closes #76

ariasat added 5 commits

2026-05-01 15:58:19 -04:00

fix: changer module pour bottin/cms a90be37148

feature: Import bottin be2a940599

progress: utilise bottin.BindClientFlags c0b3a38503

fix: utilise bottin flags dans tests 8c39cf36f8

feature: changer mapstructure de config dans env et compose 4a7a89f1c3

ariasat added 1 commit

2026-05-01 16:00:14 -04:00

feature: update readme pour .env et test.env pour new bottin 18cce39285

This pull request has changes conflicting with the target branch.

go.mod
go.sum
handler.go

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'WIP: Import bottin et utilise ses configs' (#145) from New_Bottin into main

Merge commit body

Reviewed-on: https://git.agecem.com/bottin/cms/pulls/145

Merge pull request 'WIP: Import bottin et utilise ses configs' (#145) from New_Bottin into main

Reviewed-on: https://git.agecem.com/bottin/cms/pulls/145

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin New_Bottin:New_Bottin

git switch New_Bottin

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff New_Bottin

git switch New_Bottin

git rebase main

git switch main

git merge --ff-only New_Bottin

git switch New_Bottin

git rebase main

git switch main

git merge --no-ff New_Bottin

git switch main

git merge --squash New_Bottin