Add latest changes from gitlab-org/gitlab@master

6 files changed, 17 insertions, 17 deletions

diff --git a/doc/university/README.md b/doc/university/README.md
index 25f77906e68..2d2321ffc2d 100644
--- a/doc/university/README.md
+++ b/doc/university/README.md
@@ -11,7 +11,7 @@ If you're looking for a GitLab subscription for _your university_, see our [Educ
 
 CAUTION: **Caution:**
 Some of the content in GitLab University may be out of date and we plan to
-[evaluate](https://gitlab.com/gitlab-org/gitlab-ce/issues/41064) it.
+[evaluate](https://gitlab.com/gitlab-org/gitlab-foss/issues/41064) it.
 
 The GitLab University curriculum is composed of GitLab videos, screencasts, presentations, projects and external GitLab content hosted on other services and has been organized into the following sections:
 
diff --git a/doc/university/process/README.md b/doc/university/process/README.md
index 1a555f065ed..c3e023da655 100644
--- a/doc/university/process/README.md
+++ b/doc/university/process/README.md
@@ -13,7 +13,7 @@ please submit a merge request to add an upcoming class, assign to
 
 ## Adding classes
 
-1. All training materials of any kind should be added to [GitLab CE](https://gitlab.com/gitlab-org/gitlab-ce/)
+1. All training materials of any kind should be added to [GitLab CE](https://gitlab.com/gitlab-org/gitlab-foss/)
    to ensure they are available to a broad audience (don't use any other repo or
    storage for training materials).
 1. Don't make materials that are needlessly specific to one group of people, try
diff --git a/doc/university/support/README.md b/doc/university/support/README.md
index 0634e01764f..76cc258355f 100644
--- a/doc/university/support/README.md
+++ b/doc/university/support/README.md
@@ -47,14 +47,14 @@ Sometimes we need to upgrade customers from old versions of GitLab to latest, so
 
 - [Installation Methods](https://about.gitlab.com/install/):
   - [Omnibus](https://gitlab.com/gitlab-org/omnibus-gitlab/)
-  - [Docker](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/docker)
-  - [Source](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md)
+  - [Docker](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/docker)
+  - [Source](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/install/installation.md)
 - Get yourself a Digital Ocean droplet, where you can install and maintain your own instance of GitLab
   - Ask in #infrastructure about this
   - Populate with some test data
   - Keep this up-to-date as patch and version releases become available, just like our customers would
 - Try out the following installation path
-  - [Install GitLab 4.2 from source](https://gitlab.com/gitlab-org/gitlab-ce/blob/d67117b5a185cfb15a1d7e749588ff981ffbf779/doc/install/installation.md)
+  - [Install GitLab 4.2 from source](https://gitlab.com/gitlab-org/gitlab-foss/blob/d67117b5a185cfb15a1d7e749588ff981ffbf779/doc/install/installation.md)
     - External MySQL database
     - External NGINX
   - Create some test data
@@ -63,10 +63,10 @@ Sometimes we need to upgrade customers from old versions of GitLab to latest, so
     - Groups
     - Projects
   - [Backup using our Backup rake task](../../raketasks/backup_restore.md#creating-a-backup-of-the-gitlab-system)
-  - [Upgrade to 5.0 source using our Upgrade documentation](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/update/4.2-to-5.0.md)
-  - [Upgrade to 5.1 source](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/update/5.0-to-5.1.md)
-  - [Upgrade to 6.0 source](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/update/5.1-to-6.0.md)
-  - [Upgrade to 7.14 source](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/update/6.x-or-7.x-to-7.14.md)
+  - [Upgrade to 5.0 source using our Upgrade documentation](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/update/4.2-to-5.0.md)
+  - [Upgrade to 5.1 source](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/update/5.0-to-5.1.md)
+  - [Upgrade to 6.0 source](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/update/5.1-to-6.0.md)
+  - [Upgrade to 7.14 source](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/update/6.x-or-7.x-to-7.14.md)
   - [Perform the MySQL to PostgreSQL migration to convert your backup](../../update/mysql_to_postgresql.md)
   - [Upgrade to Omnibus 7.14](https://docs.gitlab.com/omnibus/update/README.html#upgrading-from-a-non-omnibus-installation-to-an-omnibus-installation)
   - [Restore backup using our Restore rake task](../../raketasks/backup_restore.md#restore)
@@ -152,10 +152,10 @@ Some tickets need specific knowledge or a deep understanding of a particular com
 ### Learn about raising issues and fielding feature proposals
 
 - Understand what's in the pipeline and proposed features at GitLab: [Direction Page](https://about.gitlab.com/direction/)
-- Practice searching issues and filtering using [labels](https://gitlab.com/gitlab-org/gitlab-ce/labels) to find existing feature proposals and bugs
+- Practice searching issues and filtering using [labels](https://gitlab.com/gitlab-org/gitlab-foss/labels) to find existing feature proposals and bugs
 - If raising a new issue always provide a relevant label and a link to the relevant ticket in Zendesk
-- Add [customer labels](https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name%5B%5D=customer) for those issues relevant to our subscribers
-- Take a look at the [existing issue templates](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#issue-tracker) to see what is expected
+- Add [customer labels](https://gitlab.com/gitlab-org/gitlab-foss/issues?label_name%5B%5D=customer) for those issues relevant to our subscribers
+- Take a look at the [existing issue templates](https://gitlab.com/gitlab-org/gitlab/blob/master/CONTRIBUTING.md#issue-tracker) to see what is expected
 - Raise issues for bugs in a manner that would make the issue easily reproducible. A Developer or a contributor may work on your issue
 
 ### Goals
@@ -176,8 +176,8 @@ Move on to understanding some of GitLab's more advanced features. You can make u
 - Set up [GitLab CI](../../ci/quick_start/README.md)
 - Create your first [GitLab Page](../../administration/pages/index.md)
 - Get to know the GitLab Codebase by reading through the source code:
-  - Find the differences between the [EE codebase](https://gitlab.com/gitlab-org/gitlab-ce)
-     and the [CE codebase](https://gitlab.com/gitlab-org/gitlab-ce)
+  - Find the differences between the [EE codebase](https://gitlab.com/gitlab-org/gitlab-foss)
+     and the [CE codebase](https://gitlab.com/gitlab-org/gitlab-foss)
 - Ask as many questions as you can think of on the `#support` chat channel
 
 ### Get initiated for on-call duty
diff --git a/doc/university/training/end-user/README.md b/doc/university/training/end-user/README.md
index 1218465c87a..0ea51a95445 100644
--- a/doc/university/training/end-user/README.md
+++ b/doc/university/training/end-user/README.md
@@ -186,7 +186,7 @@ git push origin squash_some_bugs
 
 - Review the Thoughtbot code-review guide for suggestions to follow when reviewing merge requests:
   [Thoughtbot](https://github.com/thoughtbot/guides/tree/master/code-review)
-- See GitLab merge requests for examples: [Merge Requests](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests)
+- See GitLab merge requests for examples: [Merge Requests](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests)
 
 ## Merge Conflicts
 
diff --git a/doc/university/training/topics/merge_requests.md b/doc/university/training/topics/merge_requests.md
index 656871ae5b2..357c845ba17 100644
--- a/doc/university/training/topics/merge_requests.md
+++ b/doc/university/training/topics/merge_requests.md
@@ -34,4 +34,4 @@ Review the Thoughtbot code-review guide for suggestions to follow when reviewing
 [https://github.com/thoughtbot/guides/tree/master/code-review](https://github.com/thoughtbot/guides/tree/master/code-review)
 
 See GitLab merge requests for examples:
-[https://gitlab.com/gitlab-org/gitlab-ce/merge_requests](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests)
+[https://gitlab.com/gitlab-org/gitlab-foss/merge_requests](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests)
diff --git a/doc/university/training/user_training.md b/doc/university/training/user_training.md
index 37107e13584..231039b0be8 100644
--- a/doc/university/training/user_training.md
+++ b/doc/university/training/user_training.md
@@ -214,7 +214,7 @@ Create your first merge request:
 Review the Thoughtbot code-review guide for suggestions to follow when reviewing merge requests:
 <https://github.com/thoughtbot/guides/tree/master/code-review>.
 
-See GitLab merge requests for examples: <https://gitlab.com/gitlab-org/gitlab-ce/merge_requests>.
+See GitLab merge requests for examples: <https://gitlab.com/gitlab-org/gitlab-foss/merge_requests>.
 
 ## Explore GitLab projects