diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 09:09:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 09:09:33 +0300 |
commit | 000087abd5a11442a7e34b0e5f3bf86cb40fa8e4 (patch) | |
tree | f928981b150721e7ac15c6c55cd4f558abf94e73 /doc/administration/merge_request_diffs.md | |
parent | 5de7e7c72a59f8a99c71ec33948a53a64f73d075 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/merge_request_diffs.md')
-rw-r--r-- | doc/administration/merge_request_diffs.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/administration/merge_request_diffs.md b/doc/administration/merge_request_diffs.md index 3c4e239d137..93cdbff6621 100644 --- a/doc/administration/merge_request_diffs.md +++ b/doc/administration/merge_request_diffs.md @@ -72,7 +72,8 @@ be configured already. ## Object Storage Settings -NOTE: **Note:** In GitLab 13.2 and later, we recommend using the +NOTE: **Note:** +In GitLab 13.2 and later, we recommend using the [consolidated object storage settings](object_storage.md#consolidated-object-storage-configuration). This section describes the earlier configuration format. |