diff options
| author | Marcia Ramos <marcia@gitlab.com> | 2019-06-11 18:46:14 +0000 |
|---|---|---|
| committer | Marcia Ramos <marcia@gitlab.com> | 2019-06-11 18:46:14 +0000 |
| commit | 2876b3e68dec7c41f87dcfc154533fb185ac9f8e (patch) | |
| tree | 103efe5cd36405682bd2fd11112de2531fc3c5f8 | |
| parent | c3e825e01ee868b3cb67cedd9514030fda7081a2 (diff) | |
| parent | f6c143bb8974a6decbefc7dad69eb1947f9bfd36 (diff) | |
| download | gitlab-ce-2876b3e68dec7c41f87dcfc154533fb185ac9f8e.tar.gz | |
Merge branch 'rnienaber-component-diagram-docs' into 'master'
Add high level component overview back to architecture page
See merge request gitlab-org/gitlab-ce!28729
| -rw-r--r-- | doc/development/architecture.md | 15 | ||||
| -rw-r--r-- | doc/development/img/architecture_simplified.png | bin | 0 -> 61590 bytes |
2 files changed, 15 insertions, 0 deletions
diff --git a/doc/development/architecture.md b/doc/development/architecture.md index 26f2e4f4762..5f32cd7eba2 100644 --- a/doc/development/architecture.md +++ b/doc/development/architecture.md @@ -30,6 +30,21 @@ Gitaly executes git operations from gitlab-shell and the GitLab web app, and pro You may also be interested in the [production architecture of GitLab.com](https://about.gitlab.com/handbook/engineering/infrastructure/production-architecture/). +### Simplified Component Overview + +This is a simplified architecture diagram that can be used to +understand GitLab's architecture. + +A complete architecture diagram is available in our +[component diagram](#component-diagram) below. + + + +<!-- +To update this diagram, GitLab team members can edit this source file: +https://docs.google.com/drawings/d/1fBzAyklyveF-i-2q-OHUIqDkYfjjxC4mq5shwKSZHLs/edit. + --> + ### Component diagram ```mermaid diff --git a/doc/development/img/architecture_simplified.png b/doc/development/img/architecture_simplified.png Binary files differnew file mode 100644 index 00000000000..1698c167c5e --- /dev/null +++ b/doc/development/img/architecture_simplified.png |
