diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 09:09:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 09:09:30 +0300 |
commit | 4dfc8711171fe0c04bc6b8b224687603026dea46 (patch) | |
tree | e1b4640f8e56bb09f412a3dca1510983245491c2 /doc/topics | |
parent | cfd62c3a3ebbc85f5787c103bfa6de1997ab8e11 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/topics')
-rw-r--r-- | doc/topics/git/index.md | 2 | ||||
-rw-r--r-- | doc/topics/git/lfs/index.md | 4 | ||||
-rw-r--r-- | doc/topics/git/lfs/migrate_to_git_lfs.md | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md index 9f9d502af60..019194d1bba 100644 --- a/doc/topics/git/index.md +++ b/doc/topics/git/index.md @@ -87,6 +87,6 @@ The following relate to Git Large File Storage: - [Migrate an existing Git repo with Git LFS](lfs/migrate_to_git_lfs.md) - [Removing objects from LFS](lfs/index.md#removing-objects-from-lfs) - [GitLab Git LFS user documentation](lfs/index.md) -- [GitLab Git LFS admin documentation](../../administration/lfs/lfs_administration.md) +- [GitLab Git LFS admin documentation](../../administration/lfs/index.md) - [git-annex to Git-LFS migration guide](lfs/migrate_from_git_annex_to_git_lfs.md) - [Towards a production quality open source Git LFS server](https://about.gitlab.com/blog/2015/08/13/towards-a-production-quality-open-source-git-lfs-server/) diff --git a/doc/topics/git/lfs/index.md b/doc/topics/git/lfs/index.md index dcd9706dce5..325a87215c4 100644 --- a/doc/topics/git/lfs/index.md +++ b/doc/topics/git/lfs/index.md @@ -21,7 +21,7 @@ instructions from where to fetch or where to push the large file. ## GitLab server configuration -Documentation for GitLab instance administrators is under [LFS administration doc](../../../administration/lfs/lfs_administration.md). +Documentation for GitLab instance administrators is under [LFS administration doc](../../../administration/lfs/index.md). ## Requirements @@ -201,7 +201,7 @@ If the status `error 501` is shown, it is because: - Git LFS support is not enabled on the GitLab server. Check with your GitLab administrator why Git LFS is not enabled on the server. See - [LFS administration documentation](../../../administration/lfs/lfs_administration.md) for instructions + [LFS administration documentation](../../../administration/lfs/index.md) for instructions on how to enable LFS support. - Git LFS client version is not supported by GitLab server. Check your Git LFS diff --git a/doc/topics/git/lfs/migrate_to_git_lfs.md b/doc/topics/git/lfs/migrate_to_git_lfs.md index 27ecf65b6cd..60859686047 100644 --- a/doc/topics/git/lfs/migrate_to_git_lfs.md +++ b/doc/topics/git/lfs/migrate_to_git_lfs.md @@ -165,7 +165,7 @@ but commented out to help encourage others to add to it in the future. --> - [Getting Started with Git LFS](https://about.gitlab.com/blog/2017/01/30/getting-started-with-git-lfs-tutorial/) - [Migrate from Git Annex to Git LFS](migrate_from_git_annex_to_git_lfs.md) - [GitLab's Git LFS user documentation](index.md) -- [GitLab's Git LFS administrator documentation](../../../administration/lfs/lfs_administration.md) +- [GitLab's Git LFS administrator documentation](../../../administration/lfs/index.md) - Alternative method to [migrate an existing repo to Git LFS](https://github.com/git-lfs/git-lfs/wiki/Tutorial#migrating-existing-repository-data-to-lfs) <!-- |