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

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErnst van Nierop <ernst@gitlab.com>2017-05-23 00:33:34 +0300
committerErnst van Nierop <ernst@gitlab.com>2017-05-23 00:33:34 +0300
commit93b22677ac4b76d7e5fd995627f48f782c1078d3 (patch)
tree29c1996aeb3d9a3aa3009edca1f7ae4c0abb5b6a /doc/development/architecture.md
parent5915b219e3a6ff70fbaad3ed938428fddfc5997b (diff)
Per discussion
Diffstat (limited to 'doc/development/architecture.md')
-rw-r--r--doc/development/architecture.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/architecture.md b/doc/development/architecture.md
index da40033a788..acd5e3c2093 100644
--- a/doc/development/architecture.md
+++ b/doc/development/architecture.md
@@ -66,7 +66,7 @@ When serving repositories over HTTP/HTTPS GitLab utilizes the GitLab API to reso
The add-on component gitlab-shell serves repositories over SSH. It manages the SSH keys within `/home/git/.ssh/authorized_keys` which should not be manually edited. gitlab-shell accesses the bare repositories through Gitaly to serve git objects and communicates with redis to submit jobs to Sidekiq for GitLab to process. gitlab-shell queries the GitLab API to determine authorization and access.
-Gitaly executes git operations from gitlab-shell and Workhorse, and provides an API to the GitLab web app to get attributes from git (e.g. title, branches, tags, other meta data), and to get blobs (e.g. diffs, commits, files).
+Gitaly executes git operations from gitlab-shell and the GitLab web app, and provides an API to the GitLab web app to get attributes from git (e.g. title, branches, tags, other meta data), and to get blobs (e.g. diffs, commits, files).
You may also be interested in the [production architecture of GitLab.com](https://about.gitlab.com/handbook/infrastructure/production-architecture/).