vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-03 05:00:56 +00:00
Code Issues Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
André Roth
2024-11-01 21:09:23 +01:00
parent 096fa47c6d
commit 9b8f6b1d56
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/publish.go
-12
View File
@@ -102,7 +102,6 @@ func apiPublishList(c *gin.Context) {
c.JSON(http.StatusOK, repos) c.JSON(http.StatusOK, repos)
} }
<<<<<<< HEAD
// @Summary Show Published Repository // @Summary Show Published Repository
// @Description **Get published repository information** // @Description **Get published repository information**
// @Description // @Description
@@ -118,17 +117,6 @@ func apiPublishList(c *gin.Context) {
// @Failure 500 {object} Error "Internal Error" // @Failure 500 {object} Error "Internal Error"
// @Router /api/publish/{prefix}/{distribution} [get] // @Router /api/publish/{prefix}/{distribution} [get]
func apiPublishShow(c *gin.Context) { func apiPublishShow(c *gin.Context) {
=======
// @Summary TODO
// @Description **ToDo**
// @Description To Do
// @Tags Publish
// @Produce json
// @Success 200 {object} string "msg"
// @Failure 404 {object} Error "Not Found"
// @Router /api/publish/{prefix} [post]
func apiPublishRepoOrSnapshot(c *gin.Context) {
>>>>>>> d237283f (add api documentation stubs)
param := slashEscape(c.Params.ByName("prefix")) param := slashEscape(c.Params.ByName("prefix"))
storage, prefix := deb.ParsePrefix(param) storage, prefix := deb.ParsePrefix(param)
distribution := slashEscape(c.Params.ByName("distribution")) distribution := slashEscape(c.Params.ByName("distribution"))