summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRachel Nienaber <rnienaber@gitlab.com>2019-06-11 18:46:14 +0000
committerMarcia Ramos <marcia@gitlab.com>2019-06-11 18:46:14 +0000
commitf6c143bb8974a6decbefc7dad69eb1947f9bfd36 (patch)
tree103efe5cd36405682bd2fd11112de2531fc3c5f8
parentc3e825e01ee868b3cb67cedd9514030fda7081a2 (diff)
downloadgitlab-ce-f6c143bb8974a6decbefc7dad69eb1947f9bfd36.tar.gz
Final doc review
- Wrap text - Move image to /img/
-rw-r--r--doc/development/architecture.md15
-rw-r--r--doc/development/img/architecture_simplified.pngbin0 -> 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.
+
+![Simplified Component Overview](img/architecture_simplified.png)
+
+<!--
+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
new file mode 100644
index 00000000000..1698c167c5e
--- /dev/null
+++ b/doc/development/img/architecture_simplified.png
Binary files differ