summaryrefslogtreecommitdiff
path: root/doc/development/diffs.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 03:09:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 03:09:28 +0000
commitbe2f4c5788975597dd7be1c8a3525549770c1216 (patch)
tree083ed0d7e29e26d479c00e00d9cb89d74ebbb0ef /doc/development/diffs.md
parent2711c26beaca6c3a5a3be4b65e01557faf0185b6 (diff)
downloadgitlab-ce-be2f4c5788975597dd7be1c8a3525549770c1216.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/diffs.md')
-rw-r--r--doc/development/diffs.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/diffs.md b/doc/development/diffs.md
index 43d0d6b4902..3f855d90756 100644
--- a/doc/development/diffs.md
+++ b/doc/development/diffs.md
@@ -26,7 +26,7 @@ The diffs fetching process _limits_ single file diff sizes and the overall size
then persisted on `merge_request_diff_files` table.
Even though diffs larger than 10% of the value of `ApplicationSettings#diff_max_patch_bytes` are collapsed,
-we still keep them on Postgres. However, diff files larger than defined _safety limits_
+we still keep them on PostgreSQL. However, diff files larger than defined _safety limits_
(see the [Diff limits section](#diff-limits)) are _not_ persisted in the database.
In order to present diffs information on the Merge Request diffs page, we: