summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-11-01 10:34:23 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-11-01 10:34:23 +0000
commit7f47e13218477c13cc627c2f0664500b72ea18b7 (patch)
tree077f08ada085795dab3a4ecbcfa0436d67642977 /config
parent1c50200b9aba86d2ba66b81dee7886a51dc38409 (diff)
parent733ae9492129e835f183902a97ee0886e2dbdc9b (diff)
downloadgitlab-ce-7f47e13218477c13cc627c2f0664500b72ea18b7.tar.gz
Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'
Fix typos in comments and specs See merge request gitlab-org/gitlab-ce!22683
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index a4db125f831..d37775e772d 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -587,7 +587,7 @@ production: &base
gitaly:
# Path to the directory containing Gitaly client executables.
client_path: /home/git/gitaly/bin
- # Default Gitaly authentication token. Can be overriden per storage. Can
+ # Default Gitaly authentication token. Can be overridden per storage. Can
# be left blank when Gitaly is running locally on a Unix socket, which
# is the normal way to deploy Gitaly.
token: