aboutsummaryrefslogtreecommitdiffstats
path: root/modules/context
diff options
context:
space:
mode:
authorEthan Koenig <etk39@cornell.edu>2017-03-14 20:52:01 -0400
committerLunny Xiao <xiaolunwen@gmail.com>2017-03-15 08:52:01 +0800
commit021904e4e65804baa67b38e193e15aa37a391c60 (patch)
tree5c4f74764048eadd39a51c1b27e9c4937a0d236b /modules/context
parentec0ae5d50c59315a3c597b1cf24d4c5508c718e5 (diff)
downloadgitea-021904e4e65804baa67b38e193e15aa37a391c60.tar.gz
gitea-021904e4e65804baa67b38e193e15aa37a391c60.zip
Fix typos in models/ and modules/ (#1248)
Diffstat (limited to 'modules/context')
-rw-r--r--modules/context/api.go2
-rw-r--r--modules/context/context.go2
-rw-r--r--modules/context/repo.go4
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/context/api.go b/modules/context/api.go
index 725a3461aa..0d279d93b2 100644
--- a/modules/context/api.go
+++ b/modules/context/api.go
@@ -43,7 +43,7 @@ func (ctx *APIContext) Error(status int, title string, obj interface{}) {
})
}
-// SetLinkHeader sets pagination link header by given totol number and page size.
+// SetLinkHeader sets pagination link header by given total number and page size.
func (ctx *APIContext) SetLinkHeader(total, pageSize int) {
page := paginater.New(total, pageSize, ctx.QueryInt("page"), 0)
links := make([]string, 0, 4)
diff --git a/modules/context/context.go b/modules/context/context.go
index a77c1dc630..fa53b484ee 100644
--- a/modules/context/context.go
+++ b/modules/context/context.go
@@ -164,7 +164,7 @@ func Contexter() macaron.Handler {
ctx.Data["PageStartTime"] = time.Now()
- // Get user from session if logined.
+ // Get user from session if logged in.
ctx.User, ctx.IsBasicAuth = auth.SignedInUser(ctx.Context, ctx.Session)
if ctx.User != nil {
diff --git a/modules/context/repo.go b/modules/context/repo.go
index 76af49ffd7..9e37ae3fbf 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -27,7 +27,7 @@ type PullRequest struct {
HeadInfo string // [<user>:]<branch>
}
-// Repository contains informations to operate a repository
+// Repository contains information to operate a repository
type Repository struct {
AccessMode models.AccessMode
IsWatching bool
@@ -330,7 +330,7 @@ func RepoAssignment(args ...bool) macaron.Handler {
}
}
- // People who have push access or have fored repository can propose a new pull request.
+ // People who have push access or have forked repository can propose a new pull request.
if ctx.Repo.IsWriter() || (ctx.IsSigned && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID)) {
// Pull request is allowed if this is a fork repository
// and base repository accepts pull requests.