efforting.tech/gitea
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Correct spelling (#36783)

Browse Source 
I was testing typos-cli and fixed some misspelled wording here.
All changes are internal — no public API fields, database columns,
locale keys, or migration names are affected.
This commit is contained in:
Nicolas
2026-02-28 20:23:20 +01:00
committed by GitHub
parent 3b250ba04e
commit dae2d32186
45 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/mailer.go
View File

@@ -17,10 +17,10 @@ func runSendMail(ctx context.Context, c *cli.Command) error {
setting.MustInstalled() setting.MustInstalled()
subject := c.String("title") subject := c.String("title")
confirmSkiped := c.Bool("force") confirmSkipped := c.Bool("force")
body := c.String("content") body := c.String("content")
if !confirmSkiped { if !confirmSkipped {
if len(body) == 0 { if len(body) == 0 {
fmt.Print("warning: Content is empty") fmt.Print("warning: Content is empty")
} }

4
models/issues/review_list.go
View File

@@ -173,9 +173,9 @@ func GetReviewsByIssueID(ctx context.Context, issueID int64) (latestReviews, mig
reviewersMap := make(map[int64][]*Review) // key is reviewer id reviewersMap := make(map[int64][]*Review) // key is reviewer id
originalReviewersMap := make(map[int64][]*Review) // key is original author id originalReviewersMap := make(map[int64][]*Review) // key is original author id
reviewTeamsMap := make(map[int64][]*Review) // key is reviewer team id reviewTeamsMap := make(map[int64][]*Review) // key is reviewer team id
countedReivewTypes := []ReviewType{ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest, ReviewTypeComment} countedReviewTypes := []ReviewType{ReviewTypeApprove, ReviewTypeReject, ReviewTypeRequest, ReviewTypeComment}
for _, review := range reviews { for _, review := range reviews {
if review.ReviewerTeamID == 0 && slices.Contains(countedReivewTypes, review.Type) && !review.Dismissed { if review.ReviewerTeamID == 0 && slices.Contains(countedReviewTypes, review.Type) && !review.Dismissed {
if review.OriginalAuthorID != 0 { if review.OriginalAuthorID != 0 {
originalReviewersMap[review.OriginalAuthorID] = append(originalReviewersMap[review.OriginalAuthorID], review) originalReviewersMap[review.OriginalAuthorID] = append(originalReviewersMap[review.OriginalAuthorID], review)
} else { } else {

2
models/organization/org.go
View File

@@ -178,7 +178,7 @@ func (org *Organization) HomeLink() string {
return org.AsUser().HomeLink() return org.AsUser().HomeLink()
} }
// FindOrgMembersOpts represensts find org members conditions // FindOrgMembersOpts represents find org members conditions
type FindOrgMembersOpts struct { type FindOrgMembersOpts struct {
db.ListOptions db.ListOptions
Doer *user_model.User Doer *user_model.User

2
models/user/list.go
View File

@@ -24,7 +24,7 @@ func (users UserList) GetUserIDs() []int64 {
return userIDs return userIDs
} }
// GetTwoFaStatus return state of 2FA enrollement // GetTwoFaStatus return state of 2FA enrollment
func (users UserList) GetTwoFaStatus(ctx context.Context) map[int64]bool { func (users UserList) GetTwoFaStatus(ctx context.Context) map[int64]bool {
results := make(map[int64]bool, len(users)) results := make(map[int64]bool, len(users))
for _, user := range users { for _, user := range users {

2
models/user/user.go
View File

@@ -185,7 +185,7 @@ func (u *User) BeforeUpdate() {
} }
// FIXME: this email doesn't need to be in lowercase, because the emails are mainly managed by the email table with lower_email field // FIXME: this email doesn't need to be in lowercase, because the emails are mainly managed by the email table with lower_email field
// This trick could be removed in new releases to display the user inputed email as-is. // This trick could be removed in new releases to display the user inputted email as-is.
u.Email = strings.ToLower(u.Email) u.Email = strings.ToLower(u.Email)
if !u.IsOrganization() { if !u.IsOrganization() {
if len(u.AvatarEmail) == 0 { if len(u.AvatarEmail) == 0 {

2
modules/actions/workflows_test.go
View File

@@ -190,7 +190,7 @@ func TestDetectMatched(t *testing.T) {
expected: true, expected: true,
}, },
{ {
desc: "HookEventSchedue(schedule) matches GithubEventSchedule(schedule)", desc: "HookEventSchedule(schedule) matches GithubEventSchedule(schedule)",
triggedEvent: webhook_module.HookEventSchedule, triggedEvent: webhook_module.HookEventSchedule,
payload: nil, payload: nil,
yamlOn: "on: schedule", yamlOn: "on: schedule",

2
modules/auth/password/hash/setting.go
View File

@@ -14,7 +14,7 @@ const DefaultHashAlgorithmName = "pbkdf2"
var DefaultHashAlgorithm *PasswordHashAlgorithm var DefaultHashAlgorithm *PasswordHashAlgorithm
// aliasAlgorithNames provides a mapping between the value of PASSWORD_HASH_ALGO // aliasAlgorithmNames provides a mapping between the value of PASSWORD_HASH_ALGO
// configured in the app.ini and the parameters used within the hashers internally. // configured in the app.ini and the parameters used within the hashers internally.
// //
// If it is necessary to change the default parameters for any hasher in future you // If it is necessary to change the default parameters for any hasher in future you

2
modules/git/foreachref/format.go
View File

@@ -72,7 +72,7 @@ func (f Format) Parser(r io.Reader) *Parser {
return NewParser(r, f) return NewParser(r, f)
} }
// hexEscaped produces hex-escpaed characters from a string. For example, "\n\0" // hexEscaped produces hex-escaped characters from a string. For example, "\n\0"
// would turn into "%0a%00". // would turn into "%0a%00".
func (f Format) hexEscaped(delim []byte) string { func (f Format) hexEscaped(delim []byte) string {
var escaped strings.Builder var escaped strings.Builder

4
modules/indexer/code/elasticsearch/elasticsearch.go
View File

@@ -393,7 +393,7 @@ func (b *Indexer) Search(ctx context.Context, opts *internal.SearchOptions) (int
elastic.NewHighlight(). elastic.NewHighlight().
Field("content"). Field("content").
Field("filename"). Field("filename").
NumOfFragments(0). // return all highting content on fragments NumOfFragments(0). // return all highlighting content on fragments
HighlighterType("fvh"), HighlighterType("fvh"),
). ).
Sort("_score", false). Sort("_score", false).
@@ -426,7 +426,7 @@ func (b *Indexer) Search(ctx context.Context, opts *internal.SearchOptions) (int
elastic.NewHighlight(). elastic.NewHighlight().
Field("content"). Field("content").
Field("filename"). Field("filename").
NumOfFragments(0). // return all highting content on fragments NumOfFragments(0). // return all highlighting content on fragments
HighlighterType("fvh"), HighlighterType("fvh"),
). ).
Sort("_score", false). Sort("_score", false).

2
modules/lfstransfer/backend/backend.go
View File

@@ -95,7 +95,7 @@ func (g *GiteaBackend) Batch(_ string, pointers []transfer.BatchItem, args trans
var respBody lfs.BatchResponse var respBody lfs.BatchResponse
err = json.Unmarshal(respBytes, &respBody) err = json.Unmarshal(respBytes, &respBody)
if err != nil { if err != nil {
g.logger.Log("json umarshal error", err) g.logger.Log("json unmarshal error", err)
return nil, err return nil, err
} }

4
modules/lfstransfer/backend/lock.go
View File

@@ -69,7 +69,7 @@ func (g *giteaLockBackend) Create(path, refname string) (transfer.Lock, error) {
var respBody lfslock.LFSLockResponse var respBody lfslock.LFSLockResponse
err = json.Unmarshal(respBytes, &respBody) err = json.Unmarshal(respBytes, &respBody)
if err != nil { if err != nil {
g.logger.Log("json umarshal error", err) g.logger.Log("json unmarshal error", err)
return nil, err return nil, err
} }
@@ -202,7 +202,7 @@ func (g *giteaLockBackend) queryLocks(v url.Values) ([]transfer.Lock, string, er
var respBody lfslock.LFSLockList var respBody lfslock.LFSLockList
err = json.Unmarshal(respBytes, &respBody) err = json.Unmarshal(respBytes, &respBody)
if err != nil { if err != nil {
g.logger.Log("json umarshal error", err) g.logger.Log("json unmarshal error", err)
return nil, "", err return nil, "", err
} }

2
modules/lfstransfer/logger.go
View File

@@ -17,5 +17,5 @@ func newLogger() transfer.Logger {
} }
// Log implements transfer.Logger // Log implements transfer.Logger
func (g *GiteaLogger) Log(msg string, itms ...any) { func (g *GiteaLogger) Log(msg string, items ...any) {
} }

8
modules/markup/common/linkify.go
View File

@@ -20,13 +20,13 @@ import (
) )
type GlobalVarsType struct { type GlobalVarsType struct {
wwwURLRegxp *regexp.Regexp wwwURLRegexp *regexp.Regexp
LinkRegex *regexp.Regexp // fast matching a URL link, no any extra validation. LinkRegex *regexp.Regexp // fast matching a URL link, no any extra validation.
} }
var GlobalVars = sync.OnceValue(func() *GlobalVarsType { var GlobalVars = sync.OnceValue(func() *GlobalVarsType {
v := &GlobalVarsType{} v := &GlobalVarsType{}
v.wwwURLRegxp = regexp.MustCompile(`^www\.[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}((?:/|[#?])[-a-zA-Z0-9@:%_\+.~#!?&//=\(\);,'">\^{}\[\]` + "`" + `]*)?`) v.wwwURLRegexp = regexp.MustCompile(`^www\.[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}((?:/|[#?])[-a-zA-Z0-9@:%_\+.~#!?&//=\(\);,'">\^{}\[\]` + "`" + `]*)?`)
v.LinkRegex, _ = xurls.StrictMatchingScheme("https?://") v.LinkRegex, _ = xurls.StrictMatchingScheme("https?://")
return v return v
}) })
@@ -75,7 +75,7 @@ func (s *linkifyParser) Parse(parent ast.Node, block text.Reader, pc parser.Cont
m = GlobalVars().LinkRegex.FindSubmatchIndex(line) m = GlobalVars().LinkRegex.FindSubmatchIndex(line)
} }
if m == nil && bytes.HasPrefix(line, domainWWW) { if m == nil && bytes.HasPrefix(line, domainWWW) {
m = GlobalVars().wwwURLRegxp.FindSubmatchIndex(line) m = GlobalVars().wwwURLRegexp.FindSubmatchIndex(line)
protocol = []byte("http") protocol = []byte("http")
} }
if m != nil { if m != nil {

2
modules/setting/config/value.go
View File

@@ -141,7 +141,7 @@ func (opt *Option[T]) WithDefaultSimple(def T) *Option[T] {
switch v.(type) { switch v.(type) {
case string, bool, int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64: case string, bool, int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64:
default: default:
// TODO: use reflect to support convertable basic types like `type State string` // TODO: use reflect to support convertible basic types like `type State string`
r := reflect.ValueOf(v) r := reflect.ValueOf(v)
if r.Kind() != reflect.Struct { if r.Kind() != reflect.Struct {
panic("invalid type for default value, use WithDefaultFunc instead") panic("invalid type for default value, use WithDefaultFunc instead")

10
routers/api/actions/artifacts.go
View File

@@ -112,7 +112,7 @@ func ArtifactsRoutes(prefix string) *web.Router {
m.Group(artifactRouteBase, func() { m.Group(artifactRouteBase, func() {
// retrieve, list and confirm artifacts // retrieve, list and confirm artifacts
m.Combo("").Get(r.listArtifacts).Post(r.getUploadArtifactURL).Patch(r.comfirmUploadArtifact) m.Combo("").Get(r.listArtifacts).Post(r.getUploadArtifactURL).Patch(r.confirmUploadArtifact)
// handle container artifacts list and download // handle container artifacts list and download
m.Put("/{artifact_hash}/upload", r.uploadArtifact) m.Put("/{artifact_hash}/upload", r.uploadArtifact)
// handle artifacts download // handle artifacts download
@@ -297,9 +297,9 @@ func (ar artifactRoutes) uploadArtifact(ctx *ArtifactContext) {
}) })
} }
// comfirmUploadArtifact confirm upload artifact. // confirmUploadArtifact confirm upload artifact.
// if all chunks are uploaded, merge them to one file. // if all chunks are uploaded, merge them to one file.
func (ar artifactRoutes) comfirmUploadArtifact(ctx *ArtifactContext) { func (ar artifactRoutes) confirmUploadArtifact(ctx *ArtifactContext) {
_, runID, ok := validateRunID(ctx) _, runID, ok := validateRunID(ctx)
if !ok { if !ok {
return return
@@ -419,8 +419,8 @@ func (ar artifactRoutes) getDownloadArtifactURL(ctx *ArtifactContext) {
} }
if itemPath != artifacts[0].ArtifactName { if itemPath != artifacts[0].ArtifactName {
log.Error("Error dismatch artifact name, itemPath: %v, artifact: %v", itemPath, artifacts[0].ArtifactName) log.Error("Error mismatch artifact name, itemPath: %v, artifact: %v", itemPath, artifacts[0].ArtifactName)
ctx.HTTPError(http.StatusBadRequest, "Error dismatch artifact name") ctx.HTTPError(http.StatusBadRequest, "Error mismatch artifact name")
return return
} }

6
routers/api/actions/artifactsv4.go
View File

@@ -267,12 +267,12 @@ func (r *artifactV4Routes) createArtifact(ctx *ArtifactContext) {
artifactName := req.Name artifactName := req.Name
rententionDays := setting.Actions.ArtifactRetentionDays retentionDays := setting.Actions.ArtifactRetentionDays
if req.ExpiresAt != nil { if req.ExpiresAt != nil {
rententionDays = int64(time.Until(req.ExpiresAt.AsTime()).Hours() / 24) retentionDays = int64(time.Until(req.ExpiresAt.AsTime()).Hours() / 24)
} }
// create or get artifact with name and path // create or get artifact with name and path
artifact, err := actions.CreateArtifact(ctx, ctx.ActionTask, artifactName, artifactName+".zip", rententionDays) artifact, err := actions.CreateArtifact(ctx, ctx.ActionTask, artifactName, artifactName+".zip", retentionDays)
if err != nil { if err != nil {
log.Error("Error create or get artifact: %v", err) log.Error("Error create or get artifact: %v", err)
ctx.HTTPError(http.StatusInternalServerError, "Error create or get artifact") ctx.HTTPError(http.StatusInternalServerError, "Error create or get artifact")

4
routers/api/packages/arch/arch.go
View File

@@ -91,7 +91,7 @@ func UploadPackageFile(ctx *context.Context) {
return return
} }
release, err := arch_service.AquireRegistryLock(ctx, ctx.Package.Owner.ID) release, err := arch_service.AcquireRegistryLock(ctx, ctx.Package.Owner.ID)
if err != nil { if err != nil {
apiError(ctx, http.StatusInternalServerError, err) apiError(ctx, http.StatusInternalServerError, err)
return return
@@ -257,7 +257,7 @@ func DeletePackageVersion(ctx *context.Context) {
name := ctx.PathParam("name") name := ctx.PathParam("name")
version := ctx.PathParam("version") version := ctx.PathParam("version")
release, err := arch_service.AquireRegistryLock(ctx, ctx.Package.Owner.ID) release, err := arch_service.AcquireRegistryLock(ctx, ctx.Package.Owner.ID)
if err != nil { if err != nil {
apiError(ctx, http.StatusInternalServerError, err) apiError(ctx, http.StatusInternalServerError, err)
return return

2
routers/api/v1/org/hook.go
View File

@@ -13,7 +13,7 @@ import (
webhook_service "code.gitea.io/gitea/services/webhook" webhook_service "code.gitea.io/gitea/services/webhook"
) )
// ListHooks list an organziation's webhooks // ListHooks list an organization's webhooks
func ListHooks(ctx *context.APIContext) { func ListHooks(ctx *context.APIContext) {
// swagger:operation GET /orgs/{org}/hooks organization orgListHooks // swagger:operation GET /orgs/{org}/hooks organization orgListHooks
// --- // ---

2
routers/api/v1/org/team.go
View File

@@ -806,7 +806,7 @@ func SearchTeam(ctx *context.APIContext) {
ListOptions: listOptions, ListOptions: listOptions,
} }
// Only admin is allowd to search for all teams // Only admin is allowed to search for all teams
if !ctx.Doer.IsAdmin { if !ctx.Doer.IsAdmin {
opts.UserID = ctx.Doer.ID opts.UserID = ctx.Doer.ID
} }

2
routers/common/markup.go
View File

@@ -46,7 +46,7 @@ func RenderMarkup(ctx *context.Base, ctxRepo *context.Repository, mode, text, ur
return return
} }
// Ideally, this handler should be called with RepoAssigment and get the related repo from context "/owner/repo/markup" // Ideally, this handler should be called with RepoAssignment and get the related repo from context "/owner/repo/markup"
// then render could use the repo to do various things (the permission check has passed) // then render could use the repo to do various things (the permission check has passed)
// //
// However, this handler is also exposed as "/markup" without any repo context, // However, this handler is also exposed as "/markup" without any repo context,

2
routers/web/healthcheck/check.go
View File

@@ -72,7 +72,7 @@ type componentStatus struct {
// And keep in mind: this health check should NEVER be used as a "restart" trigger, for example: Docker's "HEALTHCHECK". // And keep in mind: this health check should NEVER be used as a "restart" trigger, for example: Docker's "HEALTHCHECK".
// * If Gitea is upgrading and migrating database, there will be a long time before this endpoint starts to return "pass" status. // * If Gitea is upgrading and migrating database, there will be a long time before this endpoint starts to return "pass" status.
// In this case, if the checker restarts Gitea just because it doesn't get "pass" status in short time, // In this case, if the checker restarts Gitea just because it doesn't get "pass" status in short time,
// the instance will just be restarted again and again before the migation finishes and the sitution just goes worse. // the instance will just be restarted again and again before the migration finishes and the situation just goes worse.
func Check(w http.ResponseWriter, r *http.Request) { func Check(w http.ResponseWriter, r *http.Request) {
rsp := response{ rsp := response{
Status: pass, Status: pass,

2
routers/web/repo/issue_dependency.go
View File

@@ -119,7 +119,7 @@ func RemoveDependency(ctx *context.Context) {
case "blocking": case "blocking":
depType = issues_model.DependencyTypeBlocking depType = issues_model.DependencyTypeBlocking
default: default:
ctx.HTTPError(http.StatusBadRequest, "GetDependecyType") ctx.HTTPError(http.StatusBadRequest, "GetDependencyType")
return return
} }

4
routers/web/repo/repo.go
View File

@@ -526,9 +526,9 @@ func SearchRepo(ctx *context.Context) {
ctx.SetTotalCountHeader(count) ctx.SetTotalCountHeader(count)
latestCommitStatuses, err := commitstatus_service.FindReposLastestCommitStatuses(ctx, repos) latestCommitStatuses, err := commitstatus_service.FindReposLatestCommitStatuses(ctx, repos)
if err != nil { if err != nil {
log.Error("FindReposLastestCommitStatuses: %v", err) log.Error("FindReposLatestCommitStatuses: %v", err)
ctx.JSON(http.StatusInternalServerError, nil) ctx.JSON(http.StatusInternalServerError, nil)
return return
} }

2
routers/web/repo/setting/collaboration.go
View File

@@ -208,7 +208,7 @@ func DeleteTeam(ctx *context.Context) {
} }
if err = repo_service.RemoveRepositoryFromTeam(ctx, team, ctx.Repo.Repository.ID); err != nil { if err = repo_service.RemoveRepositoryFromTeam(ctx, team, ctx.Repo.Repository.ID); err != nil {
ctx.ServerError("team.RemoveRepositorys", err) ctx.ServerError("team.RemoveRepositories", err)
return return
} }

6
services/issue/assignee.go
View File

@@ -20,10 +20,10 @@ import (
// DeleteNotPassedAssignee deletes all assignees who aren't passed via the "assignees" array // DeleteNotPassedAssignee deletes all assignees who aren't passed via the "assignees" array
func DeleteNotPassedAssignee(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, assignees []*user_model.User) (err error) { func DeleteNotPassedAssignee(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, assignees []*user_model.User) (err error) {
var found bool var found bool
oriAssignes := make([]*user_model.User, len(issue.Assignees)) oriAssignees := make([]*user_model.User, len(issue.Assignees))
_ = copy(oriAssignes, issue.Assignees) _ = copy(oriAssignees, issue.Assignees)
for _, assignee := range oriAssignes { for _, assignee := range oriAssignees {
found = false found = false
for _, alreadyAssignee := range assignees { for _, alreadyAssignee := range assignees {
if assignee.ID == alreadyAssignee.ID { if assignee.ID == alreadyAssignee.ID {

4
services/issue/pull.go
View File

@@ -113,7 +113,7 @@ func PullRequestCodeOwnersReview(ctx context.Context, pr *issues_model.PullReque
} }
// load all reviews from database // load all reviews from database
latestReivews, _, err := issues_model.GetReviewsByIssueID(ctx, pr.IssueID) latestReviews, _, err := issues_model.GetReviewsByIssueID(ctx, pr.IssueID)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -128,7 +128,7 @@ func PullRequestCodeOwnersReview(ctx context.Context, pr *issues_model.PullReque
} }
for _, u := range uniqUsers { for _, u := range uniqUsers {
if u.ID != issue.Poster.ID && !contain(latestReivews, u) { if u.ID != issue.Poster.ID && !contain(latestReviews, u) {
comment, err := issues_model.AddReviewRequest(ctx, issue, u, issue.Poster, true) comment, err := issues_model.AddReviewRequest(ctx, issue, u, issue.Poster, true)
if err != nil { if err != nil {
log.Warn("Failed add assignee user: %s to PR review: %s#%d, error: %s", u.Name, pr.BaseRepo.Name, pr.ID, err) log.Warn("Failed add assignee user: %s to PR review: %s#%d, error: %s", u.Name, pr.BaseRepo.Name, pr.ID, err)

2
services/migrations/main_test.go
View File

@@ -218,7 +218,7 @@ func assertRepositoryEqual(t *testing.T, expected, actual *base.Repository) {
func assertReviewEqual(t *testing.T, expected, actual *base.Review) { func assertReviewEqual(t *testing.T, expected, actual *base.Review) {
assert.Equal(t, expected.ID, actual.ID, "ID") assert.Equal(t, expected.ID, actual.ID, "ID")
assert.Equal(t, expected.IssueIndex, actual.IssueIndex, "IsssueIndex") assert.Equal(t, expected.IssueIndex, actual.IssueIndex, "IssueIndex")
assert.Equal(t, expected.ReviewerID, actual.ReviewerID, "ReviewerID") assert.Equal(t, expected.ReviewerID, actual.ReviewerID, "ReviewerID")
assert.Equal(t, expected.ReviewerName, actual.ReviewerName, "ReviewerName") assert.Equal(t, expected.ReviewerName, actual.ReviewerName, "ReviewerName")
assert.Equal(t, expected.Official, actual.Official, "Official") assert.Equal(t, expected.Official, actual.Official, "Official")

4
services/org/team.go
View File

@@ -312,12 +312,12 @@ func removeTeamMember(ctx context.Context, team *organization.Team, user *user_m
return err return err
} }
// Remove watches from now unaccessible // Remove watches from now inaccessible
if err := repo_service.ReconsiderWatches(ctx, repo, user); err != nil { if err := repo_service.ReconsiderWatches(ctx, repo, user); err != nil {
return err return err
} }
// Remove issue assignments from now unaccessible // Remove issue assignments from now inaccessible
if err := repo_service.ReconsiderRepoIssuesAssignee(ctx, repo, user); err != nil { if err := repo_service.ReconsiderRepoIssuesAssignee(ctx, repo, user); err != nil {
return err return err
} }

2
services/packages/arch/repository.go
View File

@@ -36,7 +36,7 @@ const (
IndexArchiveFilename = "packages.db" IndexArchiveFilename = "packages.db"
) )
func AquireRegistryLock(ctx context.Context, ownerID int64) (globallock.ReleaseFunc, error) { func AcquireRegistryLock(ctx context.Context, ownerID int64) (globallock.ReleaseFunc, error) {
return globallock.Lock(ctx, fmt.Sprintf("packages_arch_%d", ownerID)) return globallock.Lock(ctx, fmt.Sprintf("packages_arch_%d", ownerID))
} }

2
services/packages/cleanup/cleanup.go
View File

@@ -134,7 +134,7 @@ func executeCleanupOneRule(ctx context.Context, pcr *packages_model.PackageClean
return fmt.Errorf("CleanupRule [%d]: rpm.BuildAllRepositoryFiles failed: %w", pcr.ID, err) return fmt.Errorf("CleanupRule [%d]: rpm.BuildAllRepositoryFiles failed: %w", pcr.ID, err)
} }
case packages_model.TypeArch: case packages_model.TypeArch:
release, err := arch_service.AquireRegistryLock(ctx, pcr.OwnerID) release, err := arch_service.AcquireRegistryLock(ctx, pcr.OwnerID)
if err != nil { if err != nil {
return err return err
} }

6
services/packages/container/blob_uploader.go
View File

@@ -18,8 +18,8 @@ import (
var ( var (
// errWriteAfterRead occurs if Write is called after a read operation // errWriteAfterRead occurs if Write is called after a read operation
errWriteAfterRead = errors.New("write is unsupported after a read operation") errWriteAfterRead = errors.New("write is unsupported after a read operation")
// errOffsetMissmatch occurs if the file offset is different than the model // errOffsetMismatch occurs if the file offset is different than the model
errOffsetMissmatch = errors.New("offset mismatch between file and model") errOffsetMismatch = errors.New("offset mismatch between file and model")
) )
// BlobUploader handles chunked blob uploads // BlobUploader handles chunked blob uploads
@@ -86,7 +86,7 @@ func (u *BlobUploader) Append(ctx context.Context, r io.Reader) error {
return err return err
} }
if offset != u.BytesReceived { if offset != u.BytesReceived {
return errOffsetMissmatch return errOffsetMismatch
} }
n, err := io.Copy(io.MultiWriter(u.file, u.MultiHasher), r) n, err := io.Copy(io.MultiWriter(u.file, u.MultiHasher), r)

4
services/repository/commitstatus/commitstatus.go
View File

@@ -118,8 +118,8 @@ func CreateCommitStatus(ctx context.Context, repo *repo_model.Repository, creato
return nil return nil
} }
// FindReposLastestCommitStatuses loading repository default branch latest combined commit status with cache // FindReposLatestCommitStatuses loading repository default branch latest combined commit status with cache
func FindReposLastestCommitStatuses(ctx context.Context, repos []*repo_model.Repository) ([]*git_model.CommitStatus, error) { func FindReposLatestCommitStatuses(ctx context.Context, repos []*repo_model.Repository) ([]*git_model.CommitStatus, error) {
results := make([]*git_model.CommitStatus, len(repos)) results := make([]*git_model.CommitStatus, len(repos))
allCached := true allCached := true
for i, repo := range repos { for i, repo := range repos {

2
services/repository/repo_team.go
View File

@@ -108,7 +108,7 @@ func removeAllRepositoriesFromTeam(ctx context.Context, t *organization.Team) (e
return err return err
} }
// Remove watches from all users and now unaccessible repos // Remove watches from all users and now inaccessible repos
for _, user := range t.Members { for _, user := range t.Members {
has, err := access_model.HasAnyUnitAccess(ctx, user.ID, repo) has, err := access_model.HasAnyUnitAccess(ctx, user.ID, repo)
if err != nil { if err != nil {

8
templates/base/modal_actions_confirm.tmpl
View File

@@ -12,15 +12,15 @@ The ".ok.button" and ".cancel.button" selectors are also used by Fomantic Modal
{{if .ModalButtonDangerText}} {{if .ModalButtonDangerText}}
<button class="ui danger red ok button">{{.ModalButtonDangerText}}</button> <button class="ui danger red ok button">{{.ModalButtonDangerText}}</button>
{{else}} {{else}}
{{$textNegitive := ctx.Locale.Tr "modal.no"}} {{$textNegative := ctx.Locale.Tr "modal.no"}}
{{$textPositive := ctx.Locale.Tr "modal.yes"}} {{$textPositive := ctx.Locale.Tr "modal.yes"}}
{{if eq .ModalButtonTypes "confirm"}} {{if eq .ModalButtonTypes "confirm"}}
{{$textNegitive = ctx.Locale.Tr "modal.cancel"}} {{$textNegative = ctx.Locale.Tr "modal.cancel"}}
{{$textPositive = ctx.Locale.Tr "modal.confirm"}} {{$textPositive = ctx.Locale.Tr "modal.confirm"}}
{{end}} {{end}}
{{if .ModalButtonCancelText}}{{$textNegitive = .ModalButtonCancelText}}{{end}} {{if .ModalButtonCancelText}}{{$textNegative = .ModalButtonCancelText}}{{end}}
{{if .ModalButtonOkText}}{{$textPositive = .ModalButtonOkText}}{{end}} {{if .ModalButtonOkText}}{{$textPositive = .ModalButtonOkText}}{{end}}
<button class="ui cancel button">{{svg "octicon-x"}} {{$textNegitive}}</button> <button class="ui cancel button">{{svg "octicon-x"}} {{$textNegative}}</button>
<button class="ui primary ok button">{{svg "octicon-check"}} {{$textPositive}}</button> <button class="ui primary ok button">{{svg "octicon-check"}} {{$textPositive}}</button>
{{end}} {{end}}
</div> </div>

2
templates/projects/view.tmpl
View File

@@ -77,7 +77,7 @@
<div class="divider"></div> <div class="divider"></div>
</div> </div>
<div id="project-board" class="board {{if $canWriteProject}}sortable{{end}}" data-project-borad-writable="{{$canWriteProject}}" {{if $canWriteProject}}data-url="{{$.Link}}/move"{{end}}> <div id="project-board" class="board {{if $canWriteProject}}sortable{{end}}" data-project-board-writable="{{$canWriteProject}}" {{if $canWriteProject}}data-url="{{$.Link}}/move"{{end}}>
{{range .Columns}} {{range .Columns}}
<div class="project-column" {{if .Color}}style="background: {{.Color}} !important; color: {{ContrastColor .Color}} !important"{{end}} data-id="{{.ID}}" data-sorting="{{.Sorting}}" data-url="{{$.Link}}/{{.ID}}"> <div class="project-column" {{if .Color}}style="background: {{.Color}} !important; color: {{ContrastColor .Color}} !important"{{end}} data-id="{{.ID}}" data-sorting="{{.Sorting}}" data-url="{{$.Link}}/{{.ID}}">
<div class="project-column-header{{if $canWriteProject}} tw-cursor-grab{{end}}"> <div class="project-column-header{{if $canWriteProject}} tw-cursor-grab{{end}}">

2
templates/repo/diff/blob_excerpt.tmpl
View File

@@ -15,7 +15,7 @@
<td class="lines-escape lines-escape-old">{{if and $line.LeftIdx $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td> <td class="lines-escape lines-escape-old">{{if and $line.LeftIdx $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td>
<td class="lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="tw-font-mono" data-type-marker=""></span>{{end}}</td> <td class="lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="tw-font-mono" data-type-marker=""></span>{{end}}</td>
<td class="lines-code lines-code-old"> <td class="lines-code lines-code-old">
{{/* ATTENTION: BLOB-EXCERPT-COMMENT-RIGHT: here it intentially use "right" side to comment, because the backend code depends on the assumption that the comment only happens on right side*/}} {{/* ATTENTION: BLOB-EXCERPT-COMMENT-RIGHT: here it intentionally use "right" side to comment, because the backend code depends on the assumption that the comment only happens on right side*/}}
{{- if and $canCreateComment $line.RightIdx -}} {{- if and $canCreateComment $line.RightIdx -}}
<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-right{{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="right" data-idx="{{$line.RightIdx}}"> <button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-right{{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="right" data-idx="{{$line.RightIdx}}">
{{- svg "octicon-plus" -}} {{- svg "octicon-plus" -}}

4
tests/integration/admin_user_test.go
View File

@@ -43,10 +43,10 @@ func TestAdminViewUser(t *testing.T) {
func TestAdminEditUser(t *testing.T) { func TestAdminEditUser(t *testing.T) {
defer tests.PrepareTestEnv(t)() defer tests.PrepareTestEnv(t)()
testSuccessfullEdit(t, user_model.User{ID: 2, Name: "newusername", LoginName: "otherlogin", Email: "new@e-mail.gitea"}) testSuccessfulEdit(t, user_model.User{ID: 2, Name: "newusername", LoginName: "otherlogin", Email: "new@e-mail.gitea"})
} }
func testSuccessfullEdit(t *testing.T, formData user_model.User) { func testSuccessfulEdit(t *testing.T, formData user_model.User) {
makeRequest(t, formData, http.StatusSeeOther) makeRequest(t, formData, http.StatusSeeOther)
} }

6
tests/integration/api_gpg_keys_test.go
View File

@@ -63,8 +63,8 @@ func TestGPGKeys(t *testing.T) {
t.Run("CreateInvalidGPGKey", func(t *testing.T) { t.Run("CreateInvalidGPGKey", func(t *testing.T) {
testCreateInvalidGPGKey(t, tc.makeRequest, tc.token, tc.results[4]) testCreateInvalidGPGKey(t, tc.makeRequest, tc.token, tc.results[4])
}) })
t.Run("CreateNoneRegistredEmailGPGKey", func(t *testing.T) { t.Run("CreateNoneRegisteredEmailGPGKey", func(t *testing.T) {
testCreateNoneRegistredEmailGPGKey(t, tc.makeRequest, tc.token, tc.results[5]) testCreateNoneRegisteredEmailGPGKey(t, tc.makeRequest, tc.token, tc.results[5])
}) })
t.Run("CreateValidGPGKey", func(t *testing.T) { t.Run("CreateValidGPGKey", func(t *testing.T) {
testCreateValidGPGKey(t, tc.makeRequest, tc.token, tc.results[6]) testCreateValidGPGKey(t, tc.makeRequest, tc.token, tc.results[6])
@@ -179,7 +179,7 @@ func testCreateInvalidGPGKey(t *testing.T, makeRequest makeRequestFunc, token st
testCreateGPGKey(t, makeRequest, token, expected, "invalid_key") testCreateGPGKey(t, makeRequest, token, expected, "invalid_key")
} }
func testCreateNoneRegistredEmailGPGKey(t *testing.T, makeRequest makeRequestFunc, token string, expected int) { func testCreateNoneRegisteredEmailGPGKey(t *testing.T, makeRequest makeRequestFunc, token string, expected int) {
testCreateGPGKey(t, makeRequest, token, expected, `-----BEGIN PGP PUBLIC KEY BLOCK----- testCreateGPGKey(t, makeRequest, token, expected, `-----BEGIN PGP PUBLIC KEY BLOCK-----
mQENBFmGUygBCACjCNbKvMGgp0fd5vyFW9olE1CLCSyyF9gQN2hSuzmZLuAZF2Kh mQENBFmGUygBCACjCNbKvMGgp0fd5vyFW9olE1CLCSyyF9gQN2hSuzmZLuAZF2Kh

2
tests/integration/api_notification_test.go
View File

@@ -200,7 +200,7 @@ func TestAPINotificationPUT(t *testing.T) {
assert.False(t, apiNL[0].Pinned) assert.False(t, apiNL[0].Pinned)
// //
// Now nofication ID 2 is the first in the list and is unread. // Now notification ID 2 is the first in the list and is unread.
// //
req = NewRequest(t, "GET", "/api/v1/notifications?all=true"). req = NewRequest(t, "GET", "/api/v1/notifications?all=true").
AddTokenAuth(token) AddTokenAuth(token)

2
tests/integration/api_packages_maven_test.go
View File

@@ -160,7 +160,7 @@ func TestPackageMaven(t *testing.T) {
t.Run("UploadVerifySHA1", func(t *testing.T) { t.Run("UploadVerifySHA1", func(t *testing.T) {
defer tests.PrintCurrentTest(t)() defer tests.PrintCurrentTest(t)()
t.Run("Missmatch", func(t *testing.T) { t.Run("Mismatch", func(t *testing.T) {
defer tests.PrintCurrentTest(t)() defer tests.PrintCurrentTest(t)()
putFile(t, fmt.Sprintf("/%s/%s.sha1", packageVersion, filename), "test", http.StatusBadRequest) putFile(t, fmt.Sprintf("/%s/%s.sha1", packageVersion, filename), "test", http.StatusBadRequest)

4
tests/integration/api_token_test.go
View File

@@ -514,10 +514,10 @@ func runTestCase(t *testing.T, testCase *requiredScopeTestCase, user *user_model
if unauthorizedLevel == auth_model.NoAccess { if unauthorizedLevel == auth_model.NoAccess {
continue continue
} }
cateogoryUnauthorizedScopes := auth_model.GetRequiredScopes( categoryUnauthorizedScopes := auth_model.GetRequiredScopes(
unauthorizedLevel, unauthorizedLevel,
category) category)
unauthorizedScopes = append(unauthorizedScopes, cateogoryUnauthorizedScopes...) unauthorizedScopes = append(unauthorizedScopes, categoryUnauthorizedScopes...)
} }
accessToken := createAPIAccessTokenWithoutCleanUp(t, "test-token", user, unauthorizedScopes) accessToken := createAPIAccessTokenWithoutCleanUp(t, "test-token", user, unauthorizedScopes)

2
tests/integration/api_user_org_perm_test.go
View File

@@ -123,7 +123,7 @@ func TestCanReadUser(t *testing.T) {
}) })
} }
func TestUnknowUser(t *testing.T) { func TestUnknownUser(t *testing.T) {
defer tests.PrepareTestEnv(t)() defer tests.PrepareTestEnv(t)()
session := loginUser(t, "user1") session := loginUser(t, "user1")

2
tests/integration/pull_merge_test.go
View File

@@ -414,7 +414,7 @@ func TestCantMergeUnrelated(t *testing.T) {
sha := strings.TrimSpace(stdout) sha := strings.TrimSpace(stdout)
_, _, err = gitcmd.NewCommand("update-index", "--add", "--replace", "--cacheinfo"). _, _, err = gitcmd.NewCommand("update-index", "--add", "--replace", "--cacheinfo").
AddDynamicArguments("100644", sha, "somewher-over-the-rainbow"). AddDynamicArguments("100644", sha, "somewhere-over-the-rainbow").
WithDir(path). WithDir(path).
RunStdString(t.Context()) RunStdString(t.Context())
assert.NoError(t, err) assert.NoError(t, err)

6
web_src/js/features/comp/EditorMarkdown.test.ts
View File

@@ -171,9 +171,9 @@ test('EditorMarkdown', () => {
pos: number; pos: number;
}; };
const testInput = (input: ValueWithCursor, result: ValueWithCursor) => { const testInput = (input: ValueWithCursor, result: ValueWithCursor) => {
const intputValue = typeof input === 'string' ? input : input.value; const inputValue = typeof input === 'string' ? input : input.value;
const inputPos = typeof input === 'string' ? intputValue.length : input.pos; const inputPos = typeof input === 'string' ? inputValue.length : input.pos;
textarea.value = intputValue; textarea.value = inputValue;
textarea.setSelectionRange(inputPos, inputPos); textarea.setSelectionRange(inputPos, inputPos);
const e = new KeyboardEvent('keydown', {key: 'Enter', cancelable: true}); const e = new KeyboardEvent('keydown', {key: 'Enter', cancelable: true});

2
web_src/js/features/repo-projects.ts
View File

@@ -161,7 +161,7 @@ function initRepoProjectToggleFullScreen(): void {
export function initRepoProject(): void { export function initRepoProject(): void {
initRepoProjectToggleFullScreen(); initRepoProjectToggleFullScreen();
const writableProjectBoard = document.querySelector('#project-board[data-project-borad-writable="true"]'); const writableProjectBoard = document.querySelector('#project-board[data-project-board-writable="true"]');
if (!writableProjectBoard) return; if (!writableProjectBoard) return;
initRepoProjectSortable(); // no await initRepoProjectSortable(); // no await