summaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
Diffstat (limited to 'routers')
-rw-r--r--routers/api/v1/repo/issue_tracked_time.go2
-rw-r--r--routers/api/v1/user/app.go2
-rw-r--r--routers/web/admin/users.go4
-rw-r--r--routers/web/org/setting.go4
-rw-r--r--routers/web/repo/http.go2
-rw-r--r--routers/web/repo/issue.go2
-rw-r--r--routers/web/repo/view.go2
-rw-r--r--routers/web/user/auth.go2
-rw-r--r--routers/web/web.go2
9 files changed, 11 insertions, 11 deletions
diff --git a/routers/api/v1/repo/issue_tracked_time.go b/routers/api/v1/repo/issue_tracked_time.go
index 642704800b..ad774b563b 100644
--- a/routers/api/v1/repo/issue_tracked_time.go
+++ b/routers/api/v1/repo/issue_tracked_time.go
@@ -526,7 +526,7 @@ func ListTrackedTimesByRepository(ctx *context.APIContext) {
if opts.UserID == 0 {
opts.UserID = ctx.User.ID
} else {
- ctx.Error(http.StatusForbidden, "", fmt.Errorf("query user not allowed not enouth rights"))
+ ctx.Error(http.StatusForbidden, "", fmt.Errorf("query by user not allowed; not enough rights"))
return
}
}
diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go
index 7b69c50d7e..9f355a8289 100644
--- a/routers/api/v1/user/app.go
+++ b/routers/api/v1/user/app.go
@@ -166,7 +166,7 @@ func DeleteAccessToken(ctx *context.APIContext) {
case 1:
tokenID = tokens[0].ID
default:
- ctx.Error(http.StatusUnprocessableEntity, "DeleteAccessTokenByID", fmt.Errorf("multible matches for token name '%s'", token))
+ ctx.Error(http.StatusUnprocessableEntity, "DeleteAccessTokenByID", fmt.Errorf("multiple matches for token name '%s'", token))
return
}
}
diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go
index e1903ab1df..acccc516bb 100644
--- a/routers/web/admin/users.go
+++ b/routers/web/admin/users.go
@@ -205,7 +205,7 @@ func prepareUserInfo(ctx *context.Context) *models.User {
return u
}
-// EditUser show editting user page
+// EditUser show editing user page
func EditUser(ctx *context.Context) {
ctx.Data["Title"] = ctx.Tr("admin.users.edit_account")
ctx.Data["PageIsAdmin"] = true
@@ -222,7 +222,7 @@ func EditUser(ctx *context.Context) {
ctx.HTML(http.StatusOK, tplUserEdit)
}
-// EditUserPost response for editting user
+// EditUserPost response for editing user
func EditUserPost(ctx *context.Context) {
form := web.GetForm(ctx).(*forms.AdminEditUserForm)
ctx.Data["Title"] = ctx.Tr("admin.users.edit_account")
diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go
index aed90c66f7..e848939187 100644
--- a/routers/web/org/setting.go
+++ b/routers/web/org/setting.go
@@ -39,7 +39,7 @@ func Settings(ctx *context.Context) {
ctx.HTML(http.StatusOK, tplSettingsOptions)
}
-// SettingsPost response for settings change submited
+// SettingsPost response for settings change submitted
func SettingsPost(ctx *context.Context) {
form := web.GetForm(ctx).(*forms.UpdateOrgSettingForm)
ctx.Data["Title"] = ctx.Tr("org.settings")
@@ -139,7 +139,7 @@ func SettingsAvatar(ctx *context.Context) {
ctx.Redirect(ctx.Org.OrgLink + "/settings")
}
-// SettingsDeleteAvatar response for delete avatar on setings page
+// SettingsDeleteAvatar response for delete avatar on settings page
func SettingsDeleteAvatar(ctx *context.Context) {
if err := ctx.Org.Organization.DeleteAvatar(); err != nil {
ctx.Flash.Error(err.Error())
diff --git a/routers/web/repo/http.go b/routers/web/repo/http.go
index 649d6d1eb1..3390f026a0 100644
--- a/routers/web/repo/http.go
+++ b/routers/web/repo/http.go
@@ -32,7 +32,7 @@ import (
repo_service "code.gitea.io/gitea/services/repository"
)
-// httpBase implmentation git smart HTTP protocol
+// httpBase implementation git smart HTTP protocol
func httpBase(ctx *context.Context) (h *serviceHandler) {
if setting.Repository.DisableHTTPGit {
ctx.Resp.WriteHeader(http.StatusForbidden)
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index 9ef5c1d1f0..9639ea8201 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -831,7 +831,7 @@ func NewIssueChooseTemplate(ctx *context.Context) {
ctx.HTML(http.StatusOK, tplIssueChoose)
}
-// ValidateRepoMetas check and returns repository's meta informations
+// ValidateRepoMetas check and returns repository's meta information
func ValidateRepoMetas(ctx *context.Context, form forms.CreateIssueForm, isPull bool) ([]int64, []int64, int64, int64) {
var (
repo = ctx.Repo.Repository
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index 90d06d11c1..cf076bdf1a 100644
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -751,7 +751,7 @@ func renderCode(ctx *context.Context) {
ctx.HTML(http.StatusOK, tplRepoHome)
}
-// RenderUserCards render a page show users according the input templaet
+// RenderUserCards render a page show users according the input template
func RenderUserCards(ctx *context.Context, total int, getter func(opts models.ListOptions) ([]*models.User, error), tpl base.TplName) {
page := ctx.QueryInt("page")
if page <= 0 {
diff --git a/routers/web/user/auth.go b/routers/web/user/auth.go
index 6b4beff0e0..9458bf5c95 100644
--- a/routers/web/user/auth.go
+++ b/routers/web/user/auth.go
@@ -1473,7 +1473,7 @@ func ActivateEmail(ctx *context.Context) {
ctx.Redirect(setting.AppSubURL + "/user/settings/account")
}
-// ForgotPasswd render the forget pasword page
+// ForgotPasswd render the forget password page
func ForgotPasswd(ctx *context.Context) {
ctx.Data["Title"] = ctx.Tr("auth.forgot_password_title")
diff --git a/routers/web/web.go b/routers/web/web.go
index 627c88aab1..7a47f479c0 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -146,7 +146,7 @@ func Routes() *web.Route {
routes.Get("/metrics", append(common, Metrics)...)
}
- // Removed: toolbox.Toolboxer middleware will provide debug informations which seems unnecessary
+ // Removed: toolbox.Toolboxer middleware will provide debug information which seems unnecessary
common = append(common, context.Contexter())
// Get user from session if logged in.