summaryrefslogtreecommitdiff
path: root/doc/development/interacting_components.md
diff options
context:
space:
mode:
authorBen Bodenmiller <bbodenmiller@hotmail.com>2019-08-25 11:00:08 +0000
committerBen Bodenmiller <bbodenmiller@hotmail.com>2019-08-25 11:00:08 +0000
commitf2371a89f151da21e2d139f7cb159d611ba6fd0b (patch)
tree5692b4b958026565e4438063a522942d9da428eb /doc/development/interacting_components.md
parentd90b361b7c8c1aa7faa9ef1ead40e096d4ae7e42 (diff)
parent8112fb37544557b3f94c0a558175d5da99ef9829 (diff)
downloadgitlab-ce-docs-gitaly-path-fixes.tar.gz
Merge branch 'master' into 'docs-gitaly-path-fixes'docs-gitaly-path-fixes
# Conflicts: # doc/administration/gitaly/index.md
Diffstat (limited to 'doc/development/interacting_components.md')
-rw-r--r--doc/development/interacting_components.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/interacting_components.md b/doc/development/interacting_components.md
index 74d52d808e2..5e6dc8d460a 100644
--- a/doc/development/interacting_components.md
+++ b/doc/development/interacting_components.md
@@ -9,8 +9,8 @@ when making _backend_ changes that might involve multiple features or [component
## Uploads
-GitLab supports uploads to [object storage]. That means every feature and
-change that affects uploads should also be tested against [object storage],
+GitLab supports uploads to [object storage]. That means every feature and
+change that affects uploads should also be tested against [object storage],
which is _not_ enabled by default in [GDK](https://gitlab.com/gitlab-org/gitlab-development-kit).
When working on a related feature, make sure to enable and test it