Merge branch 'patch-216' into 'master'

Clarify when LFS objects are sent to object storage

See merge request gitlab-org/gitlab!38982

doc/administration/lfs/index.md

@@ -156,7 +156,7 @@ On Omnibus installations, the settings are prefixed by `lfs_object_store_`:
 
    This will migrate existing LFS objects to object storage. New LFS objects
    will be forwarded to object storage unless
-   `gitlab_rails['lfs_object_store_background_upload']` is set to false.
+   `gitlab_rails['lfs_object_store_background_upload']` and `gitlab_rails['lfs_object_store_direct_upload']` is set to `false`.
 
 ### S3 for installations from source
 
@@ -191,14 +191,14 @@ For source installations the settings are nested under `lfs:` and then
    ```
 
    This will migrate existing LFS objects to object storage. New LFS objects
-   will be forwarded to object storage unless `background_upload` is set to
-   false.
+   will be forwarded to object storage unless `background_upload` and `direct_upload` is set to
+   `false`.
 
 ### Migrating back to local storage
 
 In order to migrate back to local storage:
 
-1. Set both `direct_upload` and `background_upload` to false under the LFS object storage settings. Don't forget to restart GitLab.
+1. Set both `direct_upload` and `background_upload` to `false` under the LFS object storage settings. Don't forget to restart GitLab.
 1. Run `rake gitlab:lfs:migrate_to_local` on your console.
 1. Disable `object_storage` for LFS objects in `gitlab.rb`. Remember to restart GitLab afterwards.