Skip to content

Commit dbd002d

Browse files
lunnylunny
committed
Correct committer spelling and fix wrong replaced words
1 parent 153793b commit dbd002d

11 files changed

+60
-60
lines changed

‎models/commit_status.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,11 @@ func NewCommitStatus(opts NewCommitStatusOptions) error {
206206
return fmt.Errorf("NewCommitStatus[%s, %s]: no user specified", repoPath, opts.SHA)
207207
}
208208

209-
ctx, commiter, err := db.TxContext()
209+
ctx, committer, err := db.TxContext()
210210
if err != nil {
211211
return fmt.Errorf("NewCommitStatus[repo_id: %d, user_id: %d, sha: %s]: %v", opts.Repo.ID, opts.Creator.ID, opts.SHA, err)
212212
}
213-
defer commiter.Close()
213+
defer committer.Close()
214214

215215
opts.CommitStatus.Description = strings.TrimSpace(opts.CommitStatus.Description)
216216
opts.CommitStatus.Context = strings.TrimSpace(opts.CommitStatus.Context)
@@ -243,7 +243,7 @@ func NewCommitStatus(opts NewCommitStatusOptions) error {
243243
return fmt.Errorf("Insert CommitStatus[%s, %s]: %v", repoPath, opts.SHA, err)
244244
}
245245

246-
return commiter.Commit()
246+
return committer.Commit()
247247
}
248248

249249
// SignCommitWithStatuses represents a commit with validation of signature and status state.

‎models/consistency.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -262,11 +262,11 @@ func CountOrphanedIssues() (int64, error) {
262262

263263
// DeleteOrphanedIssues delete issues without a repo
264264
func DeleteOrphanedIssues() error {
265-
ctx, commiter, err := db.TxContext()
265+
ctx, committer, err := db.TxContext()
266266
if err != nil {
267267
return err
268268
}
269-
defer commiter.Close()
269+
defer committer.Close()
270270

271271
var ids []int64
272272

@@ -286,10 +286,10 @@ func DeleteOrphanedIssues() error {
286286
attachmentPaths = append(attachmentPaths, paths...)
287287
}
288288

289-
if err := commiter.Commit(); err != nil {
289+
if err := committer.Commit(); err != nil {
290290
return err
291291
}
292-
commiter.Close()
292+
committer.Close()
293293

294294
// Remove issue attachment files.
295295
for i := range attachmentPaths {

‎models/gpg_key.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -227,17 +227,17 @@ func DeleteGPGKey(doer *User, id int64) (err error) {
227227
return ErrGPGKeyAccessDenied{doer.ID, key.ID}
228228
}
229229

230-
ctx, commiter, err := db.TxContext()
230+
ctx, committer, err := db.TxContext()
231231
if err != nil {
232232
return err
233233
}
234-
defer commiter.Close()
234+
defer committer.Close()
235235

236236
if _, err = deleteGPGKey(ctx.Engine(), key.KeyID); err != nil {
237237
return err
238238
}
239239

240-
return commiter.Commit()
240+
return committer.Commit()
241241
}
242242

243243
func checkKeyEmails(email string, keys ...*GPGKey) (bool, string) {

‎models/gpg_key_add.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ func AddGPGKey(ownerID int64, content, token, signature string) ([]*GPGKey, erro
7272
return nil, err
7373
}
7474

75-
ctx, commiter, err := db.TxContext()
75+
ctx, committer, err := db.TxContext()
7676
if err != nil {
7777
return nil, err
7878
}
79-
defer commiter.Close()
79+
defer committer.Close()
8080

8181
keys := make([]*GPGKey, 0, len(ekeys))
8282

@@ -123,5 +123,5 @@ func AddGPGKey(ownerID int64, content, token, signature string) ([]*GPGKey, erro
123123
}
124124
keys = append(keys, key)
125125
}
126-
return keys, commiter.Commit()
126+
return keys, committer.Commit()
127127
}

‎models/gpg_key_verify.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ import (
3030

3131
// VerifyGPGKey marks a GPG key as verified
3232
func VerifyGPGKey(ownerID int64, keyID, token, signature string) (string, error) {
33-
ctx, commiter, err := db.TxContext()
33+
ctx, committer, err := db.TxContext()
3434
if err != nil {
3535
return "", err
3636
}
37-
defer commiter.Close()
37+
defer committer.Close()
3838

3939
key := new(GPGKey)
4040

@@ -96,7 +96,7 @@ func VerifyGPGKey(ownerID int64, keyID, token, signature string) (string, error)
9696
return "", err
9797
}
9898

99-
if err := commiter.Commit(); err != nil {
99+
if err := committer.Commit(); err != nil {
100100
return "", err
101101
}
102102

‎models/issue.go

+30-30
Original file line numberDiff line numberDiff line change
@@ -467,11 +467,11 @@ func (issue *Issue) clearLabels(e db.Engine, doer *User) (err error) {
467467
// ClearLabels removes all issue labels as the given user.
468468
// Triggers appropriate WebHooks, if any.
469469
func (issue *Issue) ClearLabels(doer *User) (err error) {
470-
ctx, commiter, err := db.TxContext()
470+
ctx, committer, err := db.TxContext()
471471
if err != nil {
472472
return err
473473
}
474-
defer commiter.Close()
474+
defer committer.Close()
475475

476476
if err := issue.loadRepo(ctx.Engine()); err != nil {
477477
return err
@@ -491,7 +491,7 @@ func (issue *Issue) ClearLabels(doer *User) (err error) {
491491
return err
492492
}
493493

494-
if err = commiter.Commit(); err != nil {
494+
if err = committer.Commit(); err != nil {
495495
return fmt.Errorf("Commit: %v", err)
496496
}
497497

@@ -515,11 +515,11 @@ func (ts labelSorter) Swap(i, j int) {
515515
// ReplaceLabels removes all current labels and add new labels to the issue.
516516
// Triggers appropriate WebHooks, if any.
517517
func (issue *Issue) ReplaceLabels(labels []*Label, doer *User) (err error) {
518-
ctx, commiter, err := db.TxContext()
518+
ctx, committer, err := db.TxContext()
519519
if err != nil {
520520
return err
521521
}
522-
defer commiter.Close()
522+
defer committer.Close()
523523

524524
if err = issue.loadRepo(ctx.Engine()); err != nil {
525525
return err
@@ -577,7 +577,7 @@ func (issue *Issue) ReplaceLabels(labels []*Label, doer *User) (err error) {
577577
return err
578578
}
579579

580-
return commiter.Commit()
580+
return committer.Commit()
581581
}
582582

583583
// ReadBy sets issue to be read by given user.
@@ -682,11 +682,11 @@ func (issue *Issue) doChangeStatus(e db.Engine, doer *User, isMergePull bool) (*
682682

683683
// ChangeStatus changes issue status to open or closed.
684684
func (issue *Issue) ChangeStatus(doer *User, isClosed bool) (*Comment, error) {
685-
ctx, commiter, err := db.TxContext()
685+
ctx, committer, err := db.TxContext()
686686
if err != nil {
687687
return nil, err
688688
}
689-
defer commiter.Close()
689+
defer committer.Close()
690690

691691
if err := issue.loadRepo(ctx.Engine()); err != nil {
692692
return nil, err
@@ -700,7 +700,7 @@ func (issue *Issue) ChangeStatus(doer *User, isClosed bool) (*Comment, error) {
700700
return nil, err
701701
}
702702

703-
if err = commiter.Commit(); err != nil {
703+
if err = committer.Commit(); err != nil {
704704
return nil, fmt.Errorf("Commit: %v", err)
705705
}
706706

@@ -709,11 +709,11 @@ func (issue *Issue) ChangeStatus(doer *User, isClosed bool) (*Comment, error) {
709709

710710
// ChangeTitle changes the title of this issue, as the given user.
711711
func (issue *Issue) ChangeTitle(doer *User, oldTitle string) (err error) {
712-
ctx, commiter, err := db.TxContext()
712+
ctx, committer, err := db.TxContext()
713713
if err != nil {
714714
return err
715715
}
716-
defer commiter.Close()
716+
defer committer.Close()
717717

718718
if err = updateIssueCols(ctx.Engine(), issue, "name"); err != nil {
719719
return fmt.Errorf("updateIssueCols: %v", err)
@@ -738,22 +738,22 @@ func (issue *Issue) ChangeTitle(doer *User, oldTitle string) (err error) {
738738
return err
739739
}
740740

741-
return commiter.Commit()
741+
return committer.Commit()
742742
}
743743

744744
// ChangeRef changes the branch of this issue, as the given user.
745745
func (issue *Issue) ChangeRef(doer *User, oldRef string) (err error) {
746-
ctx, commiter, err := db.TxContext()
746+
ctx, committer, err := db.TxContext()
747747
if err != nil {
748748
return err
749749
}
750-
defer commiter.Close()
750+
defer committer.Close()
751751

752752
if err = updateIssueCols(ctx.Engine(), issue, "ref"); err != nil {
753753
return fmt.Errorf("updateIssueCols: %v", err)
754754
}
755755

756-
return commiter.Commit()
756+
return committer.Commit()
757757
}
758758

759759
// AddDeletePRBranchComment adds delete branch comment for pull request issue
@@ -762,11 +762,11 @@ func AddDeletePRBranchComment(doer *User, repo *Repository, issueID int64, branc
762762
if err != nil {
763763
return err
764764
}
765-
ctx, commiter, err := db.TxContext()
765+
ctx, committer, err := db.TxContext()
766766
if err != nil {
767767
return err
768768
}
769-
defer commiter.Close()
769+
defer committer.Close()
770770
opts := &CreateCommentOptions{
771771
Type: CommentTypeDeleteBranch,
772772
Doer: doer,
@@ -778,16 +778,16 @@ func AddDeletePRBranchComment(doer *User, repo *Repository, issueID int64, branc
778778
return err
779779
}
780780

781-
return commiter.Commit()
781+
return committer.Commit()
782782
}
783783

784784
// UpdateAttachments update attachments by UUIDs for the issue
785785
func (issue *Issue) UpdateAttachments(uuids []string) (err error) {
786-
ctx, commiter, err := db.TxContext()
786+
ctx, committer, err := db.TxContext()
787787
if err != nil {
788788
return err
789789
}
790-
defer commiter.Close()
790+
defer committer.Close()
791791
attachments, err := getAttachmentsByUUIDs(ctx.Engine(), uuids)
792792
if err != nil {
793793
return fmt.Errorf("getAttachmentsByUUIDs [uuids: %v]: %v", uuids, err)
@@ -798,18 +798,18 @@ func (issue *Issue) UpdateAttachments(uuids []string) (err error) {
798798
return fmt.Errorf("update attachment [id: %d]: %v", attachments[i].ID, err)
799799
}
800800
}
801-
return commiter.Commit()
801+
return committer.Commit()
802802
}
803803

804804
// ChangeContent changes issue content, as the given user.
805805
func (issue *Issue) ChangeContent(doer *User, content string) (err error) {
806806
issue.Content = content
807807

808-
ctx, commiter, err := db.TxContext()
808+
ctx, committer, err := db.TxContext()
809809
if err != nil {
810810
return err
811811
}
812-
defer commiter.Close()
812+
defer committer.Close()
813813

814814
if err = updateIssueCols(ctx.Engine(), issue, "content"); err != nil {
815815
return fmt.Errorf("UpdateIssueCols: %v", err)
@@ -819,7 +819,7 @@ func (issue *Issue) ChangeContent(doer *User, content string) (err error) {
819819
return err
820820
}
821821

822-
return commiter.Commit()
822+
return committer.Commit()
823823
}
824824

825825
// GetTasks returns the amount of tasks in the issues content
@@ -990,11 +990,11 @@ func newIssue(e db.Engine, doer *User, opts NewIssueOptions) (err error) {
990990
// RecalculateIssueIndexForRepo create issue_index for repo if not exist and
991991
// update it based on highest index of existing issues assigned to a repo
992992
func RecalculateIssueIndexForRepo(repoID int64) error {
993-
ctx, commiter, err := db.TxContext()
993+
ctx, committer, err := db.TxContext()
994994
if err != nil {
995995
return err
996996
}
997-
defer commiter.Close()
997+
defer committer.Close()
998998

999999
if err := db.UpsertResourceIndex(ctx.Engine(), "issue_index", repoID); err != nil {
10001000
return err
@@ -1009,7 +1009,7 @@ func RecalculateIssueIndexForRepo(repoID int64) error {
10091009
return err
10101010
}
10111011

1012-
return commiter.Commit()
1012+
return committer.Commit()
10131013
}
10141014

10151015
// NewIssue creates new issue with labels for repository.
@@ -1021,11 +1021,11 @@ func NewIssue(repo *Repository, issue *Issue, labelIDs []int64, uuids []string)
10211021

10221022
issue.Index = idx
10231023

1024-
ctx, commiter, err := db.TxContext()
1024+
ctx, committer, err := db.TxContext()
10251025
if err != nil {
10261026
return err
10271027
}
1028-
defer commiter.Close()
1028+
defer committer.Close()
10291029

10301030
if err = newIssue(ctx.Engine(), issue.Poster, NewIssueOptions{
10311031
Repo: repo,
@@ -1039,7 +1039,7 @@ func NewIssue(repo *Repository, issue *Issue, labelIDs []int64, uuids []string)
10391039
return fmt.Errorf("newIssue: %v", err)
10401040
}
10411041

1042-
if err = commiter.Commit(); err != nil {
1042+
if err = committer.Commit(); err != nil {
10431043
return fmt.Errorf("Commit: %v", err)
10441044
}
10451045

‎models/issue_label.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,11 @@ func NewLabel(label *Label) error {
261261

262262
// NewLabels creates new labels
263263
func NewLabels(labels ...*Label) error {
264-
ctx, commiter, err := db.TxContext()
264+
ctx, committer, err := db.TxContext()
265265
if err != nil {
266266
return err
267267
}
268-
defer commiter.Close()
268+
defer committer.Close()
269269

270270
for _, label := range labels {
271271
if !LabelColorPattern.MatchString(label.Color) {
@@ -275,7 +275,7 @@ func NewLabels(labels ...*Label) error {
275275
return err
276276
}
277277
}
278-
return commiter.Commit()
278+
return committer.Commit()
279279
}
280280

281281
// UpdateLabel updates label information.
@@ -744,11 +744,11 @@ func newIssueLabels(e db.Engine, issue *Issue, labels []*Label, doer *User) (err
744744

745745
// NewIssueLabels creates a list of issue-label relations.
746746
func NewIssueLabels(issue *Issue, labels []*Label, doer *User) (err error) {
747-
ctx, commiter, err := db.TxContext()
747+
ctx, committer, err := db.TxContext()
748748
if err != nil {
749749
return err
750750
}
751-
defer commiter.Close()
751+
defer committer.Close()
752752

753753
if err = newIssueLabels(ctx.Engine(), issue, labels, doer); err != nil {
754754
return err
@@ -759,7 +759,7 @@ func NewIssueLabels(issue *Issue, labels []*Label, doer *User) (err error) {
759759
return err
760760
}
761761

762-
return commiter.Commit()
762+
return committer.Commit()
763763
}
764764

765765
func deleteIssueLabel(e db.Engine, issue *Issue, label *Label, doer *User) (err error) {

‎models/list_options.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func setSessionPagination(sess *xorm.Session, p Paginator) *xorm.Session {
3131
return sess.Limit(take, skip)
3232
}
3333

34-
// setSessionPagination sets pagination for a database db.Engine
34+
// setSessionPagination sets pagination for a database engine
3535
func setEnginePagination(e db.Engine, p Paginator) db.Engine {
3636
skip, take := p.GetSkipTake()
3737

‎modules/emoji/emoji_data.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)