mirror of
https://github.com/gogs/gogs.git
synced 2026-05-07 13:25:56 +02:00
Fix typos throughout the codebase (#7514)
This commit is contained in:
committed by
GitHub
parent
9f1499f3ab
commit
3cc8e7aa6d
@@ -476,7 +476,7 @@ func runWeb(c *cli.Context) error {
|
||||
m.Get("/milestones", repo.Milestones)
|
||||
}, ignSignIn, context.RepoAssignment(true))
|
||||
m.Group("/:username/:reponame", func() {
|
||||
// FIXME: should use different URLs but mostly same logic for comments of issue and pull reuqest.
|
||||
// FIXME: should use different URLs but mostly same logic for comments of issue and pull request.
|
||||
// So they can apply their own enable/disable logic on routers.
|
||||
m.Group("/issues", func() {
|
||||
m.Combo("/new", repo.MustEnableIssues).Get(context.RepoRef(), repo.NewIssue).
|
||||
@@ -501,7 +501,7 @@ func runWeb(c *cli.Context) error {
|
||||
}, ignSignIn, context.RepoAssignment(false, true))
|
||||
|
||||
m.Group("/:username/:reponame", func() {
|
||||
// FIXME: should use different URLs but mostly same logic for comments of issue and pull reuqest.
|
||||
// FIXME: should use different URLs but mostly same logic for comments of issue and pull request.
|
||||
// So they can apply their own enable/disable logic on routers.
|
||||
m.Group("/issues", func() {
|
||||
m.Group("/:index", func() {
|
||||
|
||||
@@ -465,7 +465,7 @@ func usersDeleteByID(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
reposStore := newReposStore(s.db)
|
||||
|
||||
t.Run("user still has repository ownership", func(t *testing.T) {
|
||||
alice, err := s.Create(ctx, "alice", "alice@exmaple.com", CreateUserOptions{})
|
||||
alice, err := s.Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
|
||||
require.NoError(t, err)
|
||||
|
||||
_, err = reposStore.Create(ctx, alice.ID, CreateRepoOptions{Name: "repo1"})
|
||||
@@ -477,7 +477,7 @@ func usersDeleteByID(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
})
|
||||
|
||||
t.Run("user still has organization membership", func(t *testing.T) {
|
||||
bob, err := s.Create(ctx, "bob", "bob@exmaple.com", CreateUserOptions{})
|
||||
bob, err := s.Create(ctx, "bob", "bob@example.com", CreateUserOptions{})
|
||||
require.NoError(t, err)
|
||||
|
||||
// TODO: Use Orgs.Create to replace SQL hack when the method is available.
|
||||
@@ -498,14 +498,14 @@ func usersDeleteByID(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
assert.Equal(t, wantErr, err)
|
||||
})
|
||||
|
||||
cindy, err := s.Create(ctx, "cindy", "cindy@exmaple.com", CreateUserOptions{})
|
||||
cindy, err := s.Create(ctx, "cindy", "cindy@example.com", CreateUserOptions{})
|
||||
require.NoError(t, err)
|
||||
frank, err := s.Create(ctx, "frank", "frank@exmaple.com", CreateUserOptions{})
|
||||
frank, err := s.Create(ctx, "frank", "frank@example.com", CreateUserOptions{})
|
||||
require.NoError(t, err)
|
||||
repo2, err := reposStore.Create(ctx, cindy.ID, CreateRepoOptions{Name: "repo2"})
|
||||
require.NoError(t, err)
|
||||
|
||||
testUser, err := s.Create(ctx, "testUser", "testUser@exmaple.com", CreateUserOptions{})
|
||||
testUser, err := s.Create(ctx, "testUser", "testUser@example.com", CreateUserOptions{})
|
||||
require.NoError(t, err)
|
||||
|
||||
// Mock watches, stars and follows
|
||||
@@ -673,14 +673,14 @@ func usersDeleteByID(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
|
||||
func usersDeleteInactivated(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
// User with repository ownership should be skipped
|
||||
alice, err := s.Create(ctx, "alice", "alice@exmaple.com", CreateUserOptions{})
|
||||
alice, err := s.Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
|
||||
require.NoError(t, err)
|
||||
reposStore := newReposStore(s.db)
|
||||
_, err = reposStore.Create(ctx, alice.ID, CreateRepoOptions{Name: "repo1"})
|
||||
require.NoError(t, err)
|
||||
|
||||
// User with organization membership should be skipped
|
||||
bob, err := s.Create(ctx, "bob", "bob@exmaple.com", CreateUserOptions{})
|
||||
bob, err := s.Create(ctx, "bob", "bob@example.com", CreateUserOptions{})
|
||||
require.NoError(t, err)
|
||||
// TODO: Use Orgs.Create to replace SQL hack when the method is available.
|
||||
org1, err := s.Create(ctx, "org1", "org1@example.com", CreateUserOptions{})
|
||||
@@ -695,11 +695,11 @@ func usersDeleteInactivated(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
require.NoError(t, err)
|
||||
|
||||
// User activated state should be skipped
|
||||
_, err = s.Create(ctx, "cindy", "cindy@exmaple.com", CreateUserOptions{Activated: true})
|
||||
_, err = s.Create(ctx, "cindy", "cindy@example.com", CreateUserOptions{Activated: true})
|
||||
require.NoError(t, err)
|
||||
|
||||
// User meant to be deleted
|
||||
david, err := s.Create(ctx, "david", "david@exmaple.com", CreateUserOptions{})
|
||||
david, err := s.Create(ctx, "david", "david@example.com", CreateUserOptions{})
|
||||
require.NoError(t, err)
|
||||
|
||||
tempSSHRootPath := filepath.Join(os.TempDir(), "usersDeleteInactivated-tempSSHRootPath")
|
||||
@@ -726,7 +726,7 @@ func usersGetByEmail(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
|
||||
t.Run("ignore organization", func(t *testing.T) {
|
||||
// TODO: Use Orgs.Create to replace SQL hack when the method is available.
|
||||
org, err := s.Create(ctx, "gogs", "gogs@exmaple.com", CreateUserOptions{})
|
||||
org, err := s.Create(ctx, "gogs", "gogs@example.com", CreateUserOptions{})
|
||||
require.NoError(t, err)
|
||||
|
||||
err = s.db.Model(&User{}).Where("id", org.ID).UpdateColumn("type", UserTypeOrganization).Error
|
||||
@@ -738,7 +738,7 @@ func usersGetByEmail(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
})
|
||||
|
||||
t.Run("by primary email", func(t *testing.T) {
|
||||
alice, err := s.Create(ctx, "alice", "alice@exmaple.com", CreateUserOptions{})
|
||||
alice, err := s.Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
|
||||
require.NoError(t, err)
|
||||
|
||||
_, err = s.GetByEmail(ctx, alice.Email)
|
||||
@@ -760,7 +760,7 @@ func usersGetByEmail(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
require.NoError(t, err)
|
||||
|
||||
// TODO: Use UserEmails.Create to replace SQL hack when the method is available.
|
||||
email2 := "bob2@exmaple.com"
|
||||
email2 := "bob2@example.com"
|
||||
err = s.db.Exec(`INSERT INTO email_address (uid, email) VALUES (?, ?)`, bob.ID, email2).Error
|
||||
require.NoError(t, err)
|
||||
|
||||
@@ -779,7 +779,7 @@ func usersGetByEmail(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
}
|
||||
|
||||
func usersGetByID(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
alice, err := s.Create(ctx, "alice", "alice@exmaple.com", CreateUserOptions{})
|
||||
alice, err := s.Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
|
||||
require.NoError(t, err)
|
||||
|
||||
user, err := s.GetByID(ctx, alice.ID)
|
||||
@@ -792,7 +792,7 @@ func usersGetByID(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
}
|
||||
|
||||
func usersGetByUsername(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
alice, err := s.Create(ctx, "alice", "alice@exmaple.com", CreateUserOptions{})
|
||||
alice, err := s.Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
|
||||
require.NoError(t, err)
|
||||
|
||||
user, err := s.GetByUsername(ctx, alice.Name)
|
||||
@@ -805,7 +805,7 @@ func usersGetByUsername(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
}
|
||||
|
||||
func usersGetByKeyID(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
alice, err := s.Create(ctx, "alice", "alice@exmaple.com", CreateUserOptions{})
|
||||
alice, err := s.Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
|
||||
require.NoError(t, err)
|
||||
|
||||
// TODO: Use PublicKeys.Create to replace SQL hack when the method is available.
|
||||
@@ -830,11 +830,11 @@ func usersGetByKeyID(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
}
|
||||
|
||||
func usersGetMailableEmailsByUsernames(t *testing.T, ctx context.Context, s *UsersStore) {
|
||||
alice, err := s.Create(ctx, "alice", "alice@exmaple.com", CreateUserOptions{})
|
||||
alice, err := s.Create(ctx, "alice", "alice@example.com", CreateUserOptions{})
|
||||
require.NoError(t, err)
|
||||
bob, err := s.Create(ctx, "bob", "bob@exmaple.com", CreateUserOptions{Activated: true})
|
||||
bob, err := s.Create(ctx, "bob", "bob@example.com", CreateUserOptions{Activated: true})
|
||||
require.NoError(t, err)
|
||||
_, err = s.Create(ctx, "cindy", "cindy@exmaple.com", CreateUserOptions{Activated: true})
|
||||
_, err = s.Create(ctx, "cindy", "cindy@example.com", CreateUserOptions{Activated: true})
|
||||
require.NoError(t, err)
|
||||
|
||||
got, err := s.GetMailableEmailsByUsernames(ctx, []string{alice.Name, bob.Name, "ignore-non-exist"})
|
||||
|
||||
@@ -73,7 +73,7 @@ func (s *DiffSection) ComputedInlineDiffFor(line *git.DiffLine) template.HTML {
|
||||
func diffsToHTML(diffs []diffmatchpatch.Diff, lineType git.DiffLineType) template.HTML {
|
||||
buf := bytes.NewBuffer(nil)
|
||||
|
||||
// Reproduce signs which are cutted for inline diff before.
|
||||
// Reproduce signs which are cut for inline diff before.
|
||||
switch lineType {
|
||||
case git.DiffLineAdd:
|
||||
buf.WriteByte('+')
|
||||
|
||||
@@ -35,7 +35,7 @@ func NewExclusivePool() *ExclusivePool {
|
||||
}
|
||||
|
||||
// CheckIn checks in an instance to the pool and hangs while instance
|
||||
// with same indentity is using the lock.
|
||||
// with same identity is using the lock.
|
||||
func (p *ExclusivePool) CheckIn(identity string) {
|
||||
p.lock.Lock()
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ func (q *UniqueQueue) Queue() <-chan string {
|
||||
return q.queue
|
||||
}
|
||||
|
||||
// Exist returns true if there is an instance with given indentity
|
||||
// Exist returns true if there is an instance with given identity
|
||||
// exists in the queue.
|
||||
func (q *UniqueQueue) Exist(id any) bool {
|
||||
return q.table.IsRunning(com.ToStr(id))
|
||||
|
||||
@@ -5,5 +5,5 @@ import (
|
||||
"strings"
|
||||
)
|
||||
|
||||
// InTest is ture if the current binary looks like a test artifact.
|
||||
// InTest is true if the current binary looks like a test artifact.
|
||||
var InTest = len(os.Args) > 0 && strings.HasSuffix(strings.TrimSuffix(os.Args[0], ".exe"), ".test")
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
:: this script.
|
||||
:: And, please, read carefully the installation docs first:
|
||||
:: https://gogs.io/docs/installation
|
||||
:: To unistall the service, run "nssm remove gogs" and restart Windows.
|
||||
:: To uninstall the service, run "nssm remove gogs" and restart Windows.
|
||||
|
||||
:: Set the folder where you extracted Gogs. Omit the last slash.
|
||||
SET gogspath=C:\gogs
|
||||
|
||||
Reference in New Issue
Block a user