Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2020-01-07 16:11:50 +0300
committerNick Thomas <nick@gitlab.com>2020-01-07 16:11:50 +0300
commit86d619069f226d40d3d0ba97a243db384f133d5f (patch)
tree090a8665a7c7baa49f725e4e8a64a0350c834092
parentc67adadd5b5361f9c00eb15a6029559939c0a0c9 (diff)
parent61d06bb6c9ebb8225b92a1d76841f83349c158fa (diff)
Merge branch 'fix-typos' into 'master'
Fix Typos See merge request gitlab-org/gitlab-pages!214
-rw-r--r--internal/domain/resolver.go2
-rw-r--r--internal/serving/handler.go2
-rw-r--r--internal/source/gitlab/cache/cache.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/internal/domain/resolver.go b/internal/domain/resolver.go
index 0de66ad5..6bc10f8c 100644
--- a/internal/domain/resolver.go
+++ b/internal/domain/resolver.go
@@ -9,6 +9,6 @@ import (
// Resolver represents an interface responsible for resolving a project
// per-request
type Resolver interface {
- // Resolve returns a project with a file path and an error if it occured
+ // Resolve returns a project with a file path and an error if it occurred
Resolve(*http.Request) (*serving.LookupPath, string, error)
}
diff --git a/internal/serving/handler.go b/internal/serving/handler.go
index 53a783ce..99c4ca2f 100644
--- a/internal/serving/handler.go
+++ b/internal/serving/handler.go
@@ -2,7 +2,7 @@ package serving
import "net/http"
-// Handler agregates response/request and lookup path + subpath needed to
+// Handler aggregates response/request and lookup path + subpath needed to
// handle a request and response.
type Handler struct {
Writer http.ResponseWriter
diff --git a/internal/source/gitlab/cache/cache.go b/internal/source/gitlab/cache/cache.go
index 3d518ff0..9a4ab753 100644
--- a/internal/source/gitlab/cache/cache.go
+++ b/internal/source/gitlab/cache/cache.go
@@ -48,7 +48,7 @@ func NewCache(client api.Client) *Cache {
// - we create a new cache entry
// - cache entry needs a warm up
// - a client waits until we retrieve a lookup
-// - we successfuly retrieve a lookup
+// - we successfully retrieve a lookup
// - we cache this response
// - and we pass it upstream to all clients
// 2. A domain does not exist