summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2018-01-18 15:30:23 +0000
committerLuke Bennett <lbennett@gitlab.com>2018-01-18 15:58:20 +0000
commit8c4ed4b3037da03afa83b2ab7fb34054794451e5 (patch)
tree18ffc10f7d324008e77f7b89be31ebb5480ffb01
parent55c27f02a25f97bbe207abb7c19007c6e554b2c5 (diff)
downloadgitlab-ce-8c4ed4b3037da03afa83b2ab7fb34054794451e5.tar.gz
Merge branch 'jramsay-15567-lfs-icon-docs' into 'master'
Add Git LFS status icon to docs See merge request gitlab-org/gitlab-ce!16555 (cherry picked from commit 0392b0a9d56f13016679515c840184c5cad98e8e) de2cb24f Add Git LFS status icon to docs
-rw-r--r--doc/workflow/lfs/img/lfs-icon.pngbin0 -> 4317 bytes
-rw-r--r--doc/workflow/lfs/manage_large_binaries_with_git_lfs.md5
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/workflow/lfs/img/lfs-icon.png b/doc/workflow/lfs/img/lfs-icon.png
new file mode 100644
index 00000000000..eef9a14187a
--- /dev/null
+++ b/doc/workflow/lfs/img/lfs-icon.png
Binary files differ
diff --git a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
index f7b87dee8e1..ce7895780c3 100644
--- a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
+++ b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
@@ -4,6 +4,11 @@ Managing large files such as audio, video and graphics files has always been one
of the shortcomings of Git. The general recommendation is to not have Git repositories
larger than 1GB to preserve performance.
+![Git LFS tracking status](img/lfs-icon.png)
+
+An LFS icon is shown on files tracked by Git LFS to denote if a file is stored
+as a blob or as an LFS pointer.
+
## How it works
Git LFS client talks with the GitLab server over HTTPS. It uses HTTP Basic Authentication