Merge branch 'update-deprecations' into 'master'

update reference to deprecated repo and update guide

See merge request !412

doc/development/architecture.md

@@ -4,7 +4,7 @@
 There are two editions of GitLab: [Enterprise Edition](https://about.gitlab.com/gitlab-ee/) (EE) and [Community Edition](https://about.gitlab.com/gitlab-ce/) (CE). GitLab CE is delivered via git from the [gitlabhq repository](https://gitlab.com/gitlab-org/gitlab-ce/tree/master). New versions of GitLab are released in stable branches and the master branch is for bleeding edge development.
-EE releases are available not long after CE releases. To obtain the GitLab EE there is a [repository at gitlab.com](https://gitlab.com/subscribers/gitlab-ee). For more information about the release process see the section 'New versions and upgrading' in the readme.
+EE releases are available not long after CE releases. To obtain GitLab EE there is a [repository at gitlab.com](https://gitlab.com/gitlab-org/gitlab-ee). For more information about the release process see the section 'New versions and upgrading' in the readme.
 Both EE and CE require an add-on component called gitlab-shell. It is obtained from the [gitlab-shell repository](https://gitlab.com/gitlab-org/gitlab-shell/tree/master). New versions are usually tags but staying on the master branch will give you the latest stable version. New releases are generally around the same time as GitLab CE releases with exception for informal security updates deemed critical.

doc/install/ldap.md

@@ -2,7 +2,7 @@
 You can link LDAP groups with GitLab groups.
 It gives you ability to automatically add/remove users from GitLab groups based on LDAP groups membership.
-How it works: 
+How it works:
 1. We retrieve user ldap groups
 2. We find corresponding GitLab groups
 3. We add user to GitLab groups
@@ -42,7 +42,7 @@ You need a non-LDAP admin user (such as the default admin@local.host), an LDAP u
 2. Log in as Mary.
 3. Verify that Mary is now a member of the Developers group in GitLab.
-If you get an error message when logging in as Mary, double-check your `group_base` setting in `config/gitlab.yml`. 
+If you get an error message when logging in as Mary, double-check your `group_base` setting in `config/gitlab.yml`.
 # Debug LDAP user filter with ldapsearch
@@ -55,6 +55,6 @@ The following query returns the login names of the users that will be allowed to
 ldapsearch -H ldaps://$host:$port -D "$bind_dn" -y bind_dn_password.txt  -b "$base" "(&(ObjectClass=User)($user_filter))" sAMAccountName
 ```
-- `$var` refers to a variable from the `ldap` section of your `config/gitlab.yml` https://gitlab.com/subscribers/gitlab-ee/blob/master/config/gitlab.yml.example#L100;
+- `$var` refers to a variable from the `ldap` section of your `config/gitlab.yml` https://gitlab.com/gitlab-org/gitlab-ee/blob/master/config/gitlab.yml.example#L100;
 - Replace `ldaps://` with `ldap://` if you are using the `plain` authentication method;
 - We are assuming the password for the `bind_dn` user is in `bind_dn_password.txt`.

doc/integration/jira.md

@@ -111,4 +111,3 @@ Next, go to the services page and find JIRA.
 1. Save
 Now we should be able to interact with JIRA issues.
-

doc/update/6.x-or-7.x-to-7.11.md

@@ -167,8 +167,8 @@ TIP: to see what changed in `gitlab.yml.example` in this release use next comman
 git diff 6-0-stable:config/gitlab.yml.example 7-11-stable-ee:config/gitlab.yml.example
 ```
-* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-11-stable-ee/config/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-11-stable-ee/config/unicorn.rb.example but with your settings.
+* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ee/blob/7-11-stable-ee/config/gitlab.yml.example but with your settings.
+* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ee/blob/7-11-stable-ee/config/unicorn.rb.example but with your settings.
 * Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v2.6.0/config.yml.example but with your settings.
 * Copy rack attack middleware config
@@ -184,8 +184,8 @@ sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
 ### Change Nginx settings
-* HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-11-stable-ee/lib/support/nginx/gitlab but with your settings.
-* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as https://gitlab.com/subscribers/gitlab-ee/blob/7-11-stable-ee/lib/support/nginx/gitlab-ssl but with your settings.
+* HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as https://gitlab.com/gitlab-org/gitlab-ee/blob/7-11-stable-ee/lib/support/nginx/gitlab but with your settings.
+* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ee/blob/7-11-stable-ee/lib/support/nginx/gitlab-ssl but with your settings.
 * A new `location /uploads/` section has been added that needs to have the same content as the existing `location @gitlab` section.
 ## 9. Start application

doc/update/7.11-ce-to-ee.md

@@ -21,7 +21,7 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
 ```bash
 cd /home/git/gitlab
-sudo -u git -H git remote add ee https://gitlab.com/subscribers/gitlab-ee.git
+sudo -u git -H git remote add ee https://gitlab.com/gitlab-org/gitlab-ee.git
 sudo -u git -H git fetch --all
 sudo -u git -H git checkout 7-11-stable-ee
 ```

doc/update/README.md

@@ -2,7 +2,7 @@ Depending on the installation method and your GitLab version, there are multiple
 ## CE to EE
-- [The CE to EE update guides (subscribers only)](https://gitlab.com/subscribers/gitlab-ee/tree/master/doc/update) the steps are very similar to a version upgrade: stop the server, get the code, update config files for the new functionality, install libs and do migrations, update the init script, start the application and check the application status.
+- [The CE to EE update guides](https://gitlab.com/gitlab-org/gitlab-ee/tree/master/doc/update) the steps are very similar to a version upgrade: stop the server, get the code, update config files for the new functionality, install libs and do migrations, update the init script, start the application and check the application status.
 ## Omnibus Packages
@@ -11,7 +11,7 @@ Depending on the installation method and your GitLab version, there are multiple
 ## Installation from source
 - [The individual upgrade guides](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/update) are for those who have installed GitLab from source.
-- [The CE to EE update guides](https://gitlab.com/subscribers/gitlab-ee/tree/master/doc/update) are for subscribers of the Enterprise Edition only. The steps are very similar to a version upgrade: stop the server, get the code, update config files for the new functionality, install libs and do migrations, update the init script, start the application and check the application status.
+- [The CE to EE update guides](https://gitlab.com/gitlab-org/gitlab-ee/tree/master/doc/update). The steps are very similar to a version upgrade: stop the server, get the code, update config files for the new functionality, install libs and do migrations, update the init script, start the application and check the application status.
 - [Upgrader](upgrader.md) is an automatic ruby script that performs the update for installations from source.
 - [Patch versions](patch_versions.md) guide includes the steps needed for a patch version, eg. 6.2.0 to 6.2.1.