diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2014-01-20 10:01:18 +0000 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2014-01-20 10:01:18 +0000 |
| commit | 2a748d9a0142d90814db93c4b58ff6bbae0ad2f3 (patch) | |
| tree | b311b7f468c43e0205ea9fd7bd29b1ea562dc950 | |
| parent | bb9e01cba6650c9e4aad920596647a65b85adc7e (diff) | |
| parent | da817a1f56ae4ba502f688592a74468b6e3b327c (diff) | |
| download | gitlab-ce-2a748d9a0142d90814db93c4b58ff6bbae0ad2f3.tar.gz | |
Merge branch 'ee_update_instructions' into 'master'
Add EE checkout instructions to update docs
| -rw-r--r-- | doc/update/6.0-to-6.1.md | 3 | ||||
| -rw-r--r-- | doc/update/6.0-to-6.4.md | 3 | ||||
| -rw-r--r-- | doc/update/6.1-to-6.2.md | 3 | ||||
| -rw-r--r-- | doc/update/6.2-to-6.3.md | 3 | ||||
| -rw-r--r-- | doc/update/6.3-to-6.4.md | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/doc/update/6.0-to-6.1.md b/doc/update/6.0-to-6.1.md index 53bb69ddff8..ac8f0a77efd 100644 --- a/doc/update/6.0-to-6.1.md +++ b/doc/update/6.0-to-6.1.md @@ -30,8 +30,9 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ```bash cd /home/git/gitlab -sudo -u git -H git fetch +sudo -u git -H git fetch --all sudo -u git -H git checkout 6-1-stable +# For GitLab Enterprise Edition: sudo -u git -H git checkout 6-1-stable-ee ``` ### 3. Update gitlab-shell diff --git a/doc/update/6.0-to-6.4.md b/doc/update/6.0-to-6.4.md index 6c0cfafcdf6..1e7af70804b 100644 --- a/doc/update/6.0-to-6.4.md +++ b/doc/update/6.0-to-6.4.md @@ -27,8 +27,9 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ```bash cd /home/git/gitlab -sudo -u git -H git fetch +sudo -u git -H git fetch --all sudo -u git -H git checkout 6-4-stable +# For GitLab Enterprise Edition: sudo -u git -H git checkout 6-4-stable-ee ``` diff --git a/doc/update/6.1-to-6.2.md b/doc/update/6.1-to-6.2.md index a3849faf065..7342a9117c6 100644 --- a/doc/update/6.1-to-6.2.md +++ b/doc/update/6.1-to-6.2.md @@ -23,8 +23,9 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ```bash cd /home/git/gitlab -sudo -u git -H git fetch +sudo -u git -H git fetch --all sudo -u git -H git checkout 6-2-stable # Latest version of 6-2-stable addresses CVE-2013-4489 +# For GitLab Enterprise Edition: sudo -u git -H git checkout 6-2-stable-ee ``` ### 3. Update gitlab-shell diff --git a/doc/update/6.2-to-6.3.md b/doc/update/6.2-to-6.3.md index 5b02b4cb4dd..7f916047369 100644 --- a/doc/update/6.2-to-6.3.md +++ b/doc/update/6.2-to-6.3.md @@ -20,8 +20,9 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ```bash cd /home/git/gitlab -sudo -u git -H git fetch +sudo -u git -H git fetch --all sudo -u git -H git checkout 6-3-stable +# For GitLab Enterprise Edition: sudo -u git -H git checkout 6-3-stable-ee ``` ### 3. Update gitlab-shell (and its config) diff --git a/doc/update/6.3-to-6.4.md b/doc/update/6.3-to-6.4.md index 69d184722cb..6874056498b 100644 --- a/doc/update/6.3-to-6.4.md +++ b/doc/update/6.3-to-6.4.md @@ -15,8 +15,9 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ```bash cd /home/git/gitlab -sudo -u git -H git fetch +sudo -u git -H git fetch --all sudo -u git -H git checkout 6-4-stable +# For GitLab Enterprise Edition: sudo -u git -H git checkout 6-4-stable-ee ``` ### 3. Update gitlab-shell (and its config) |