diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-19 12:09:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-19 12:09:33 +0000 |
| commit | 652bd073731b0028641672a75355c7918b5ac116 (patch) | |
| tree | e0239f98153492ac89c6fc374c5dfd1aa270d8bf /doc | |
| parent | 2af90cef2e2e9c776eae4394a43dba3be7f33d1e (diff) | |
| download | gitlab-ce-652bd073731b0028641672a75355c7918b5ac116.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/architecture.md | 4 | ||||
| -rw-r--r-- | doc/development/changelog.md | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/development/architecture.md b/doc/development/architecture.md index c75de8e8970..d1ae4fbec18 100644 --- a/doc/development/architecture.md +++ b/doc/development/architecture.md @@ -494,7 +494,9 @@ Below we describe the different pathing that HTTP vs. SSH Git requests will take ### Web Request (80/443) -TODO +When you make a Git request over HTTP, the request first takes the same steps as a web HTTP request +through NGINX and GitLab Workhorse. However, the GitLab Workhorse then diverts the request towards +Gitaly, which processes it directly. ### SSH Request (22) diff --git a/doc/development/changelog.md b/doc/development/changelog.md index 8db3346d1f1..bc1ba4eb50b 100644 --- a/doc/development/changelog.md +++ b/doc/development/changelog.md @@ -44,8 +44,9 @@ the `author` field. GitLab team members **should not**. a changelog entry regardless of these guidelines if the contributor wants one. Example: "Fixed a typo on the search results page." - Any docs-only changes **should not** have a changelog entry. -- Any change behind a feature flag **should not** have a changelog entry. The - entry should be added [in the merge request removing the feature flags](feature_flags/development.md). +- Any change behind a feature flag **should not** have a changelog entry - unless + the feature flag has been defaulted to true. The entry should be added + [in the merge request removing the feature flags](feature_flags/development.md). If the change includes a database migration (regular, post, or data migration), there should be a changelog entry for the migration change. - A fix for a regression introduced and then fixed in the same release (i.e., |