Earl Warren
|
20557c6bdb
|
[BRANDING] define the forgejo webhook type
templates/swagger/v1_json.tmpl updated with `make generate-swagger`
(cherry picked from commit 88899c492e )
(cherry picked from commit 7171bd9617 )
(cherry picked from commit 1a742446c1 )
(cherry picked from commit d7c189d7b2 )
Conflicts:
routers/web/web.go
(cherry picked from commit cbdea868e4 )
(cherry picked from commit 6cd150483b )
(cherry picked from commit 47246da8d3 )
(cherry picked from commit f2aa0e6b76 )
(cherry picked from commit 5a4fc69a16 )
(cherry picked from commit 48e444ca09 )
(cherry picked from commit 888e537811 )
(cherry picked from commit 5121f493c9 )
(cherry picked from commit 9394e55fdf )
(cherry picked from commit 3a2ce51768 )
(cherry picked from commit 719ead3a65 )
(cherry picked from commit 83e6f82e2a )
(cherry picked from commit 494a429b21 )
(cherry picked from commit 4d775db6b4 )
(cherry picked from commit b68f777dc2 )
(cherry picked from commit 5b934023fa )
(cherry picked from commit 3b1ed8b16c )
(cherry picked from commit 6bc4a46c9f )
(cherry picked from commit 8064bb24a3 )
Conflicts:
templates/admin/hook_new.tmpl
templates/org/settings/hook_new.tmpl
templates/repo/settings/webhook/base_list.tmpl
templates/repo/settings/webhook/new.tmpl
templates/user/settings/hook_new.tmpl
https://codeberg.org/forgejo/forgejo/pulls/1181
(cherry picked from commit 55f5588a91 )
Conflicts:
routers/web/web.go
https://codeberg.org/forgejo/forgejo/issues/1219
|
2023-08-21 07:22:16 +02:00 |