summaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2024-04-27 10:03:49 +0200
committerGitHub <noreply@github.com>2024-04-27 08:03:49 +0000
commit9b2536b78fdcd3cf444a2f54857d9871e153858f (patch)
tree64a2a18c397a44e4e3cf1fc392d696d919e39685 /models
parentdcc3c17e5c41ad446b71215b095617e066a2e8e1 (diff)
downloadgitea-9b2536b78fdcd3cf444a2f54857d9871e153858f.tar.gz
gitea-9b2536b78fdcd3cf444a2f54857d9871e153858f.zip
Update misspell to 0.5.1 and add `misspellings.csv` (#30573)
Misspell 0.5.0 supports passing a csv file to extend the list of misspellings, so I added some common ones from the codebase. There is at least one typo in a API response so we need to decided whether to revert that and then likely remove the dict entry.
Diffstat (limited to 'models')
-rw-r--r--models/actions/run.go6
-rw-r--r--models/actions/task.go12
-rw-r--r--models/actions/tasks_version.go8
-rw-r--r--models/fixtures/pull_request.yml20
-rw-r--r--models/issues/pull.go2
-rw-r--r--models/issues/tracked_time.go12
-rw-r--r--models/migrations/v1_17/v216.go2
7 files changed, 31 insertions, 31 deletions
diff --git a/models/actions/run.go b/models/actions/run.go
index d68710f46d..4f886999e9 100644
--- a/models/actions/run.go
+++ b/models/actions/run.go
@@ -262,11 +262,11 @@ func CancelPreviousJobs(ctx context.Context, repoID int64, ref, workflowID strin
// InsertRun inserts a run
func InsertRun(ctx context.Context, run *ActionRun, jobs []*jobparser.SingleWorkflow) error {
- ctx, commiter, err := db.TxContext(ctx)
+ ctx, committer, err := db.TxContext(ctx)
if err != nil {
return err
}
- defer commiter.Close()
+ defer committer.Close()
index, err := db.GetNextResourceIndex(ctx, "action_run_index", run.RepoID)
if err != nil {
@@ -331,7 +331,7 @@ func InsertRun(ctx context.Context, run *ActionRun, jobs []*jobparser.SingleWork
}
}
- return commiter.Commit()
+ return committer.Commit()
}
func GetRunByID(ctx context.Context, id int64) (*ActionRun, error) {
diff --git a/models/actions/task.go b/models/actions/task.go
index 9946cf5233..f2f796a626 100644
--- a/models/actions/task.go
+++ b/models/actions/task.go
@@ -216,11 +216,11 @@ func GetRunningTaskByToken(ctx context.Context, token string) (*ActionTask, erro
}
func CreateTaskForRunner(ctx context.Context, runner *ActionRunner) (*ActionTask, bool, error) {
- ctx, commiter, err := db.TxContext(ctx)
+ ctx, committer, err := db.TxContext(ctx)
if err != nil {
return nil, false, err
}
- defer commiter.Close()
+ defer committer.Close()
e := db.GetEngine(ctx)
@@ -322,7 +322,7 @@ func CreateTaskForRunner(ctx context.Context, runner *ActionRunner) (*ActionTask
task.Job = job
- if err := commiter.Commit(); err != nil {
+ if err := committer.Commit(); err != nil {
return nil, false, err
}
@@ -347,11 +347,11 @@ func UpdateTaskByState(ctx context.Context, state *runnerv1.TaskState) (*ActionT
stepStates[v.Id] = v
}
- ctx, commiter, err := db.TxContext(ctx)
+ ctx, committer, err := db.TxContext(ctx)
if err != nil {
return nil, err
}
- defer commiter.Close()
+ defer committer.Close()
e := db.GetEngine(ctx)
@@ -412,7 +412,7 @@ func UpdateTaskByState(ctx context.Context, state *runnerv1.TaskState) (*ActionT
}
}
- if err := commiter.Commit(); err != nil {
+ if err := committer.Commit(); err != nil {
return nil, err
}
diff --git a/models/actions/tasks_version.go b/models/actions/tasks_version.go
index 5c0a86538d..96c5468c1a 100644
--- a/models/actions/tasks_version.go
+++ b/models/actions/tasks_version.go
@@ -13,7 +13,7 @@ import (
// ActionTasksVersion
// If both ownerID and repoID is zero, its scope is global.
-// If ownerID is not zero and repoID is zero, its scope is org (there is no user-level runner currrently).
+// If ownerID is not zero and repoID is zero, its scope is org (there is no user-level runner currently).
// If ownerID is zero and repoID is not zero, its scope is repo.
type ActionTasksVersion struct {
ID int64 `xorm:"pk autoincr"`
@@ -73,11 +73,11 @@ func increaseTasksVersionByScope(ctx context.Context, ownerID, repoID int64) err
}
func IncreaseTaskVersion(ctx context.Context, ownerID, repoID int64) error {
- ctx, commiter, err := db.TxContext(ctx)
+ ctx, committer, err := db.TxContext(ctx)
if err != nil {
return err
}
- defer commiter.Close()
+ defer committer.Close()
// 1. increase global
if err := increaseTasksVersionByScope(ctx, 0, 0); err != nil {
@@ -101,5 +101,5 @@ func IncreaseTaskVersion(ctx context.Context, ownerID, repoID int64) error {
}
}
- return commiter.Commit()
+ return committer.Commit()
}
diff --git a/models/fixtures/pull_request.yml b/models/fixtures/pull_request.yml
index 3fc8ce630d..9a16316e5a 100644
--- a/models/fixtures/pull_request.yml
+++ b/models/fixtures/pull_request.yml
@@ -1,7 +1,7 @@
-
id: 1
type: 0 # gitea pull request
- status: 2 # mergable
+ status: 2 # mergeable
issue_id: 2
index: 2
head_repo_id: 1
@@ -16,7 +16,7 @@
-
id: 2
type: 0 # gitea pull request
- status: 2 # mergable
+ status: 2 # mergeable
issue_id: 3
index: 3
head_repo_id: 1
@@ -29,7 +29,7 @@
-
id: 3
type: 0 # gitea pull request
- status: 2 # mergable
+ status: 2 # mergeable
issue_id: 8
index: 1
head_repo_id: 11
@@ -42,7 +42,7 @@
-
id: 4
type: 0 # gitea pull request
- status: 2 # mergable
+ status: 2 # mergeable
issue_id: 9
index: 1
head_repo_id: 48
@@ -55,7 +55,7 @@
-
id: 5 # this PR is outdated (one commit behind branch1 )
type: 0 # gitea pull request
- status: 2 # mergable
+ status: 2 # mergeable
issue_id: 11
index: 5
head_repo_id: 1
@@ -68,7 +68,7 @@
-
id: 6
type: 0 # gitea pull request
- status: 2 # mergable
+ status: 2 # mergeable
issue_id: 12
index: 2
head_repo_id: 3
@@ -81,7 +81,7 @@
-
id: 7
type: 0 # gitea pull request
- status: 2 # mergable
+ status: 2 # mergeable
issue_id: 19
index: 1
head_repo_id: 58
@@ -94,7 +94,7 @@
-
id: 8
type: 0 # gitea pull request
- status: 2 # mergable
+ status: 2 # mergeable
issue_id: 20
index: 1
head_repo_id: 23
@@ -103,7 +103,7 @@
-
id: 9
type: 0 # gitea pull request
- status: 2 # mergable
+ status: 2 # mergeable
issue_id: 21
index: 1
head_repo_id: 60
@@ -112,7 +112,7 @@
-
id: 10
type: 0 # gitea pull request
- status: 2 # mergable
+ status: 2 # mergeable
issue_id: 22
index: 1
head_repo_id: 61
diff --git a/models/issues/pull.go b/models/issues/pull.go
index dc1b1b956a..4194df2e3d 100644
--- a/models/issues/pull.go
+++ b/models/issues/pull.go
@@ -807,7 +807,7 @@ func UpdateAllowEdits(ctx context.Context, pr *PullRequest) error {
// Mergeable returns if the pullrequest is mergeable.
func (pr *PullRequest) Mergeable(ctx context.Context) bool {
- // If a pull request isn't mergable if it's:
+ // If a pull request isn't mergeable if it's:
// - Being conflict checked.
// - Has a conflict.
// - Received a error while being conflict checked.
diff --git a/models/issues/tracked_time.go b/models/issues/tracked_time.go
index 4063ca043b..caa582a9fc 100644
--- a/models/issues/tracked_time.go
+++ b/models/issues/tracked_time.go
@@ -187,8 +187,8 @@ func AddTime(ctx context.Context, user *user_model.User, issue *Issue, amount in
Issue: issue,
Repo: issue.Repo,
Doer: user,
- // Content before v1.21 did store the formated string instead of seconds,
- // so use "|" as delimeter to mark the new format
+ // Content before v1.21 did store the formatted string instead of seconds,
+ // so use "|" as delimiter to mark the new format
Content: fmt.Sprintf("|%d", amount),
Type: CommentTypeAddTimeManual,
TimeID: t.ID,
@@ -267,8 +267,8 @@ func DeleteIssueUserTimes(ctx context.Context, issue *Issue, user *user_model.Us
Issue: issue,
Repo: issue.Repo,
Doer: user,
- // Content before v1.21 did store the formated string instead of seconds,
- // so use "|" as delimeter to mark the new format
+ // Content before v1.21 did store the formatted string instead of seconds,
+ // so use "|" as delimiter to mark the new format
Content: fmt.Sprintf("|%d", removedTime),
Type: CommentTypeDeleteTimeManual,
}); err != nil {
@@ -298,8 +298,8 @@ func DeleteTime(ctx context.Context, t *TrackedTime) error {
Issue: t.Issue,
Repo: t.Issue.Repo,
Doer: t.User,
- // Content before v1.21 did store the formated string instead of seconds,
- // so use "|" as delimeter to mark the new format
+ // Content before v1.21 did store the formatted string instead of seconds,
+ // so use "|" as delimiter to mark the new format
Content: fmt.Sprintf("|%d", t.Time),
Type: CommentTypeDeleteTimeManual,
}); err != nil {
diff --git a/models/migrations/v1_17/v216.go b/models/migrations/v1_17/v216.go
index 59b21d9b2c..268f472a42 100644
--- a/models/migrations/v1_17/v216.go
+++ b/models/migrations/v1_17/v216.go
@@ -4,4 +4,4 @@
package v1_17 //nolint
// This migration added non-ideal indices to the action table which on larger datasets slowed things down
-// it has been superceded by v218.go
+// it has been superseded by v218.go
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-01 03:10:30 +0000