diff options
Diffstat (limited to 'services')
| -rw-r--r-- | services/agit/agit.go | 2 | ||||
| -rw-r--r-- | services/gitdiff/gitdiff.go | 2 | ||||
| -rw-r--r-- | services/migrations/codebase.go | 4 | ||||
| -rw-r--r-- | services/migrations/gogs.go | 2 | ||||
| -rw-r--r-- | services/migrations/onedev.go | 2 | ||||
| -rw-r--r-- | services/pull/merge.go | 2 | ||||
| -rw-r--r-- | services/repository/archiver/archiver.go | 2 | ||||
| -rw-r--r-- | services/wiki/wiki_test.go | 4 |
8 files changed, 10 insertions, 10 deletions
diff --git a/services/agit/agit.go b/services/agit/agit.go index beb21940b0..34f097b42d 100644 --- a/services/agit/agit.go +++ b/services/agit/agit.go @@ -268,7 +268,7 @@ func ProcRecive(ctx *context.PrivateContext, opts *private.HookOptions) []privat return results } -// UserNameChanged hanle user name change for agit flow pull +// UserNameChanged handle user name change for agit flow pull func UserNameChanged(user *user_model.User, newName string) error { pulls, err := models.GetAllUnmergedAgitPullRequestByPoster(user.ID) if err != nil { diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index 292c270b7e..fb3e32935d 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -880,7 +880,7 @@ parsingLoop: // Handle ambiguous filenames if curFile.IsAmbiguous { // The shortest string that can end up here is: - // "--- a\t\n" without the qoutes. + // "--- a\t\n" without the quotes. // This line has a len() of 7 but doesn't contain a oldName. // So the amount that the line need is at least 8 or more. // The code will otherwise panic for a out-of-bounds. diff --git a/services/migrations/codebase.go b/services/migrations/codebase.go index 8999ee363e..395bc6152e 100644 --- a/services/migrations/codebase.go +++ b/services/migrations/codebase.go @@ -64,7 +64,7 @@ type codebaseUser struct { Email string `json:"email"` } -// CodebaseDownloader implements a Downloader interface to get repository informations +// CodebaseDownloader implements a Downloader interface to get repository information // from Codebase type CodebaseDownloader struct { base.NullDownloader @@ -111,7 +111,7 @@ func NewCodebaseDownloader(ctx context.Context, projectURL *url.URL, project, re return downloader } -// FormatCloneURL add authentification into remote URLs +// FormatCloneURL add authentication into remote URLs func (d *CodebaseDownloader) FormatCloneURL(opts base.MigrateOptions, remoteAddr string) (string, error) { return opts.CloneAddr, nil } diff --git a/services/migrations/gogs.go b/services/migrations/gogs.go index 5a477c542d..e103ef996e 100644 --- a/services/migrations/gogs.go +++ b/services/migrations/gogs.go @@ -254,7 +254,7 @@ func (g *GogsDownloader) GetTopics() ([]string, error) { return []string{}, nil } -// FormatCloneURL add authentification into remote URLs +// FormatCloneURL add authentication into remote URLs func (g *GogsDownloader) FormatCloneURL(opts MigrateOptions, remoteAddr string) (string, error) { if len(opts.AuthToken) > 0 || len(opts.AuthUsername) > 0 { u, err := url.Parse(remoteAddr) diff --git a/services/migrations/onedev.go b/services/migrations/onedev.go index 5d5aaa40f9..bb676131f3 100644 --- a/services/migrations/onedev.go +++ b/services/migrations/onedev.go @@ -69,7 +69,7 @@ type onedevUser struct { Email string `json:"email"` } -// OneDevDownloader implements a Downloader interface to get repository informations +// OneDevDownloader implements a Downloader interface to get repository information // from OneDev type OneDevDownloader struct { base.NullDownloader diff --git a/services/pull/merge.go b/services/pull/merge.go index e541495bef..34cab2fd71 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -437,7 +437,7 @@ func rawMerge(pr *models.PullRequest, doer *user_model.User, mergeStyle repo_mod var pushCmd *git.Command if mergeStyle == repo_model.MergeStyleRebaseUpdate { - // force push the rebase result to head brach + // force push the rebase result to head branch pushCmd = git.NewCommand("push", "-f", "head_repo", stagingBranch+":"+git.BranchPrefix+pr.HeadBranch) } else { pushCmd = git.NewCommand("push", "origin", baseBranch+":"+git.BranchPrefix+pr.BaseBranch) diff --git a/services/repository/archiver/archiver.go b/services/repository/archiver/archiver.go index fb40c3383d..16ee532f78 100644 --- a/services/repository/archiver/archiver.go +++ b/services/repository/archiver/archiver.go @@ -252,7 +252,7 @@ func Init() error { } log.Trace("ArchiverData Process: %#v", archiveReq) if _, err := doArchive(archiveReq); err != nil { - log.Error("Archive %v faild: %v", datum, err) + log.Error("Archive %v failed: %v", datum, err) } } } diff --git a/services/wiki/wiki_test.go b/services/wiki/wiki_test.go index 659666f977..f5ee76109c 100644 --- a/services/wiki/wiki_test.go +++ b/services/wiki/wiki_test.go @@ -190,7 +190,7 @@ func TestRepository_EditWikiPage(t *testing.T) { wikiPath := NameToFilename(newWikiName) entry, err := masterTree.GetTreeEntryByPath(wikiPath) assert.NoError(t, err) - assert.Equal(t, wikiPath, entry.Name(), "%s not editted correctly", newWikiName) + assert.Equal(t, wikiPath, entry.Name(), "%s not edited correctly", newWikiName) if newWikiName != "Home" { _, err := masterTree.GetTreeEntryByPath("Home.md") @@ -243,7 +243,7 @@ func TestPrepareWikiFileName(t *testing.T) { wikiPath: "home-of-and-%26-or-wiki-page%21.md", wantErr: false, }, { - name: "fount unescaped cases", + name: "found unescaped cases", arg: "Unescaped File", existence: true, wikiPath: "Unescaped File.md", |