summaryrefslogtreecommitdiff
path: root/doc/administration/lfs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-09 00:08:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-09 00:08:14 +0000
commited4df05ce917d6cf175aeb508b0485ae5f281a0a (patch)
tree9313abd8fd41a78eb2bf1ffd0f95f10b69cd25cb /doc/administration/lfs
parent1bdb3fe3821fc3d222361d8b2e2ec2fea2915372 (diff)
downloadgitlab-ce-ed4df05ce917d6cf175aeb508b0485ae5f281a0a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/lfs')
-rw-r--r--doc/administration/lfs/lfs_administration.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/administration/lfs/lfs_administration.md b/doc/administration/lfs/lfs_administration.md
index 7900ec13c02..d8631b05c14 100644
--- a/doc/administration/lfs/lfs_administration.md
+++ b/doc/administration/lfs/lfs_administration.md
@@ -63,13 +63,13 @@ GitLab provides two different options for the uploading mechanism: "Direct uploa
**Option 1. Direct upload**
-1. User pushes an lfs file to the GitLab instance
+1. User pushes an `lfs` file to the GitLab instance
1. GitLab-workhorse uploads the file directly to the external object storage
1. GitLab-workhorse notifies GitLab-rails that the upload process is complete
**Option 2. Background upload**
-1. User pushes an lfs file to the GitLab instance
+1. User pushes an `lfs` file to the GitLab instance
1. GitLab-rails stores the file in the local file storage
1. GitLab-rails then uploads the file to the external object storage asynchronously
@@ -127,7 +127,7 @@ Here is a configuration example with Rackspace Cloud Files.
NOTE: **Note:**
Regardless of whether the container has public access enabled or disabled, Fog will
use the TempURL method to grant access to LFS objects. If you see errors in logs referencing
-instantiating storage with a temp-url-key, ensure that you have set they key properly
+instantiating storage with a temp-url-key, ensure that you have set the key properly
on the Rackspace API and in `gitlab.rb`. You can verify the value of the key Rackspace
has set by sending a GET request with token header to the service access endpoint URL
and comparing the output of the returned headers.
@@ -261,7 +261,7 @@ See more information in [!19581](https://gitlab.com/gitlab-org/gitlab-foss/-/mer
## Known limitations
-- Support for removing unreferenced LFS objects was added in 8.14 onwards.
+- Support for removing unreferenced LFS objects was added in 8.14 onward.
- LFS authentications via SSH was added with GitLab 8.12.
- Only compatible with the Git LFS client versions 1.1.0 and up, or 1.0.2.
- The storage statistics currently count each LFS object multiple times for