summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-11-02 10:19:42 +0000
committerRémy Coutable <remy@rymai.me>2017-11-02 10:19:42 +0000
commitdfe6c5390d73aff7b20876c3864524d49be74940 (patch)
tree2ee32511e366685d4b39558eef4c79f11c35f81f /doc
parent0fd3fda8c65bfbe86f26a55843e77f98eeae23f5 (diff)
parent4485dc831ff23417cb398f656c7f91e47eeb9905 (diff)
downloadgitlab-ce-dfe6c5390d73aff7b20876c3864524d49be74940.tar.gz
Merge branch 'BDO-fixes' into 'master'38610-prevent-locked-files-from-being-edited
Fixes to changed / broken links See merge request gitlab-org/gitlab-ce!15089
Diffstat (limited to 'doc')
-rw-r--r--doc/university/README.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/university/README.md b/doc/university/README.md
index c96b9f38890..55865ac23e8 100644
--- a/doc/university/README.md
+++ b/doc/university/README.md
@@ -55,10 +55,10 @@ The curriculum is composed of GitLab videos, screencasts, presentations, project
#### 1.5. Migrating from other Source Control
-1. [Migrating from BitBucket/Stash](https://docs.gitlab.com/ee/workflow/importing/import_projects_from_bitbucket.html)
-1. [Migrating from GitHub](https://docs.gitlab.com/ee/workflow/importing/import_projects_from_github.html)
-1. [Migrating from SVN](https://docs.gitlab.com/ee/workflow/importing/migrating_from_svn.html)
-1. [Migrating from Fogbugz](https://docs.gitlab.com/ee/workflow/importing/import_projects_from_fogbugz.html)
+1. [Migrating from BitBucket/Stash](https://docs.gitlab.com/ee/user/project/import/bitbucket.html)
+1. [Migrating from GitHub](https://docs.gitlab.com/ee/user/project/import/github.html)
+1. [Migrating from SVN](https://docs.gitlab.com/ee/user/project/import/svn.html)
+1. [Migrating from Fogbugz](https://docs.gitlab.com/ee/user/project/import/fogbugz.html)
#### 1.6. GitLab Inc.
@@ -80,13 +80,13 @@ The curriculum is composed of GitLab videos, screencasts, presentations, project
- Being part of our Great Community and Contributing to GitLab
1. [Getting Started with the GitLab Development Kit (GDK)](https://about.gitlab.com/2016/06/08/getting-started-with-gitlab-development-kit/)
1. [Contributing Technical Articles to the GitLab Blog](https://about.gitlab.com/2016/01/26/call-for-writers/)
-1. [GitLab Training Workshops](https://about.gitlab.com/training)
+1. [GitLab Training Workshops](https://docs.gitlab.com/ce/university/training/end-user/)
+1. [GitLab Professional Services](https://about.gitlab.com/services/)
#### 1.8 GitLab Training Material
1. [Git and GitLab Terminology](glossary/README.md)
1. [Git and GitLab Workshop - Slides](https://docs.google.com/presentation/d/1JzTYD8ij9slejV2-TO-NzjCvlvj6mVn9BORePXNJoMI/edit?usp=drive_web)
-1. [Git and GitLab Revision](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/university/training/end-user)
---