mirror of
https://github.com/gogs/gogs.git
synced 2026-05-07 14:15:57 +02:00
mod: bump modernc.org/sqlite from 1.36.0 to 1.37.0 (#7947)
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joe Chen <jc@unknwon.io>
This commit is contained in:
@@ -104,9 +104,10 @@ func GetReferenceSHA(c *context.APIContext) {
|
||||
}
|
||||
|
||||
var sha string
|
||||
if refType == 1 {
|
||||
switch refType {
|
||||
case 1:
|
||||
sha, err = gitRepo.BranchCommitID(ref)
|
||||
} else if refType == 2 {
|
||||
case 2:
|
||||
sha, err = gitRepo.TagCommitID(ref)
|
||||
}
|
||||
if err != nil {
|
||||
|
||||
@@ -61,14 +61,14 @@ func CreateHook(c *context.APIContext, form api.CreateHookOption) {
|
||||
HookEvent: &database.HookEvent{
|
||||
ChooseEvents: true,
|
||||
HookEvents: database.HookEvents{
|
||||
Create: com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_CREATE)),
|
||||
Delete: com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_DELETE)),
|
||||
Fork: com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_FORK)),
|
||||
Push: com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_PUSH)),
|
||||
Issues: com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_ISSUES)),
|
||||
IssueComment: com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_ISSUE_COMMENT)),
|
||||
PullRequest: com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_PULL_REQUEST)),
|
||||
Release: com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_RELEASE)),
|
||||
Create: com.IsSliceContainsStr(form.Events, string(database.HookEventTypeCreate)),
|
||||
Delete: com.IsSliceContainsStr(form.Events, string(database.HookEventTypeDelete)),
|
||||
Fork: com.IsSliceContainsStr(form.Events, string(database.HookEventTypeFork)),
|
||||
Push: com.IsSliceContainsStr(form.Events, string(database.HookEventTypePush)),
|
||||
Issues: com.IsSliceContainsStr(form.Events, string(database.HookEventTypeIssues)),
|
||||
IssueComment: com.IsSliceContainsStr(form.Events, string(database.HookEventTypeIssueComment)),
|
||||
PullRequest: com.IsSliceContainsStr(form.Events, string(database.HookEventTypePullRequest)),
|
||||
Release: com.IsSliceContainsStr(form.Events, string(database.HookEventTypeRelease)),
|
||||
},
|
||||
},
|
||||
IsActive: form.Active,
|
||||
@@ -148,14 +148,14 @@ func EditHook(c *context.APIContext, form api.EditHookOption) {
|
||||
w.PushOnly = false
|
||||
w.SendEverything = false
|
||||
w.ChooseEvents = true
|
||||
w.Create = com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_CREATE))
|
||||
w.Delete = com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_DELETE))
|
||||
w.Fork = com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_FORK))
|
||||
w.Push = com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_PUSH))
|
||||
w.Issues = com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_ISSUES))
|
||||
w.IssueComment = com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_ISSUE_COMMENT))
|
||||
w.PullRequest = com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_PULL_REQUEST))
|
||||
w.Release = com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_RELEASE))
|
||||
w.Create = com.IsSliceContainsStr(form.Events, string(database.HookEventTypeCreate))
|
||||
w.Delete = com.IsSliceContainsStr(form.Events, string(database.HookEventTypeDelete))
|
||||
w.Fork = com.IsSliceContainsStr(form.Events, string(database.HookEventTypeFork))
|
||||
w.Push = com.IsSliceContainsStr(form.Events, string(database.HookEventTypePush))
|
||||
w.Issues = com.IsSliceContainsStr(form.Events, string(database.HookEventTypeIssues))
|
||||
w.IssueComment = com.IsSliceContainsStr(form.Events, string(database.HookEventTypeIssueComment))
|
||||
w.PullRequest = com.IsSliceContainsStr(form.Events, string(database.HookEventTypePullRequest))
|
||||
w.Release = com.IsSliceContainsStr(form.Events, string(database.HookEventTypeRelease))
|
||||
if err = w.UpdateEvent(); err != nil {
|
||||
c.Errorf(err, "update event")
|
||||
return
|
||||
|
||||
@@ -94,7 +94,7 @@ func EditIssueComment(c *context.APIContext, form api.EditIssueCommentOption) {
|
||||
if c.User.ID != comment.PosterID && !c.Repo.IsAdmin() {
|
||||
c.Status(http.StatusForbidden)
|
||||
return
|
||||
} else if comment.Type != database.COMMENT_TYPE_COMMENT {
|
||||
} else if comment.Type != database.CommentTypeComment {
|
||||
c.NoContent()
|
||||
return
|
||||
}
|
||||
@@ -118,7 +118,7 @@ func DeleteIssueComment(c *context.APIContext) {
|
||||
if c.User.ID != comment.PosterID && !c.Repo.IsAdmin() {
|
||||
c.Status(http.StatusForbidden)
|
||||
return
|
||||
} else if comment.Type != database.COMMENT_TYPE_COMMENT {
|
||||
} else if comment.Type != database.CommentTypeComment {
|
||||
c.NoContent()
|
||||
return
|
||||
}
|
||||
|
||||
@@ -208,8 +208,8 @@ func Migrate(c *context.APIContext, f form.MigrateRepo) {
|
||||
ctxUser := c.User
|
||||
// Not equal means context user is an organization,
|
||||
// or is another user/organization if current user is admin.
|
||||
if f.Uid != ctxUser.ID {
|
||||
org, err := database.Handle.Users().GetByID(c.Req.Context(), f.Uid)
|
||||
if f.UID != ctxUser.ID {
|
||||
org, err := database.Handle.Users().GetByID(c.Req.Context(), f.UID)
|
||||
if err != nil {
|
||||
if database.IsErrUserNotExist(err) {
|
||||
c.ErrorStatus(http.StatusUnprocessableEntity, err)
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
"gogs.io/gogs/internal/database"
|
||||
)
|
||||
|
||||
func responseApiUsers(c *context.APIContext, users []*database.User) {
|
||||
func responseAPIUsers(c *context.APIContext, users []*database.User) {
|
||||
apiUsers := make([]*api.User, len(users))
|
||||
for i := range users {
|
||||
apiUsers[i] = users[i].APIFormat()
|
||||
@@ -25,7 +25,7 @@ func listUserFollowers(c *context.APIContext, u *database.User) {
|
||||
c.Error(err, "list followers")
|
||||
return
|
||||
}
|
||||
responseApiUsers(c, users)
|
||||
responseAPIUsers(c, users)
|
||||
}
|
||||
|
||||
func ListMyFollowers(c *context.APIContext) {
|
||||
@@ -46,7 +46,7 @@ func listUserFollowing(c *context.APIContext, u *database.User) {
|
||||
c.Error(err, "list followings")
|
||||
return
|
||||
}
|
||||
responseApiUsers(c, users)
|
||||
responseAPIUsers(c, users)
|
||||
}
|
||||
|
||||
func ListMyFollowing(c *context.APIContext) {
|
||||
|
||||
Reference in New Issue
Block a user