From 50ccfe30b6e0807232924cb53e2a9a9292216631 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Wed, 12 Feb 2014 11:28:47 +0100 Subject: [PATCH 1/3] Make command for EE checkout more clear. --- doc/update/6.4-to-6.5.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/update/6.4-to-6.5.md b/doc/update/6.4-to-6.5.md index 2b1fa2744f..5df7d26312 100644 --- a/doc/update/6.4-to-6.5.md +++ b/doc/update/6.4-to-6.5.md @@ -16,8 +16,20 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ```bash cd /home/git/gitlab sudo -u git -H git fetch --all +``` + +For Gitlab Community Edition: + +```bash sudo -u git -H git checkout 6-5-stable -# For GitLab Enterprise Edition: sudo -u git -H git checkout 6-5-stable-ee +``` + +OR + +For GitLab Enterprise Edition: + +```bash +sudo -u git -H git checkout 6-5-stable-ee ``` ### 3. Update gitlab-shell (and its config) From 245d68eef8d53acabbb39751e23cbfdc3209a4f4 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Wed, 12 Feb 2014 13:25:05 +0100 Subject: [PATCH 2/3] Update minor versions upgrade guides get latest code section. --- doc/update/6.0-to-6.1.md | 15 ++++++++++++++- doc/update/6.0-to-6.5.md | 14 +++++++++++++- doc/update/6.1-to-6.2.md | 16 +++++++++++++++- doc/update/6.2-to-6.3.md | 16 +++++++++++++++- doc/update/6.3-to-6.4.md | 16 +++++++++++++++- 5 files changed, 72 insertions(+), 5 deletions(-) diff --git a/doc/update/6.0-to-6.1.md b/doc/update/6.0-to-6.1.md index da69aa60dd..cce129f993 100644 --- a/doc/update/6.0-to-6.1.md +++ b/doc/update/6.0-to-6.1.md @@ -27,7 +27,20 @@ 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 +``` + +For Gitlab Community Edition: + +```bash +sudo -u git -H git checkout 6-1-stable +``` + +OR + +For GitLab Enterprise Edition: + +```bash sudo -u git -H git checkout 6-1-stable-ee ``` diff --git a/doc/update/6.0-to-6.5.md b/doc/update/6.0-to-6.5.md index e01cc589a8..1c562976de 100644 --- a/doc/update/6.0-to-6.5.md +++ b/doc/update/6.0-to-6.5.md @@ -28,8 +28,20 @@ sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production ```bash cd /home/git/gitlab sudo -u git -H git fetch --all +``` + +For Gitlab Community Edition: + +```bash sudo -u git -H git checkout 6-5-stable -# For GitLab Enterprise Edition: sudo -u git -H git checkout 6-5-stable-ee +``` + +OR + +For GitLab Enterprise Edition: + +```bash +sudo -u git -H git checkout 6-5-stable-ee ``` diff --git a/doc/update/6.1-to-6.2.md b/doc/update/6.1-to-6.2.md index 8c51d1cd3a..ae44b71e74 100644 --- a/doc/update/6.1-to-6.2.md +++ b/doc/update/6.1-to-6.2.md @@ -20,9 +20,23 @@ 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 +``` + +For Gitlab Community Edition: + +```bash +sudo -u git -H git checkout 6-2-stable +``` + +OR + +For GitLab Enterprise Edition: + +```bash sudo -u git -H git checkout 6-2-stable-ee ``` +`` ### 3. Install additional packages diff --git a/doc/update/6.2-to-6.3.md b/doc/update/6.2-to-6.3.md index 2272ae8e1a..b56dc8d9d0 100644 --- a/doc/update/6.2-to-6.3.md +++ b/doc/update/6.2-to-6.3.md @@ -20,10 +20,24 @@ 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 +``` + +For Gitlab Community Edition: + +```bash sudo -u git -H git checkout 6-3-stable ``` +OR + +For GitLab Enterprise Edition: + +```bash +sudo -u git -H git checkout 6-3-stable-ee +``` + + ### 3. Update gitlab-shell (and its config) ```bash diff --git a/doc/update/6.3-to-6.4.md b/doc/update/6.3-to-6.4.md index f7c363f8d7..3b7f7bc140 100644 --- a/doc/update/6.3-to-6.4.md +++ b/doc/update/6.3-to-6.4.md @@ -15,10 +15,24 @@ 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 +``` + +For Gitlab Community Edition: + +```bash sudo -u git -H git checkout 6-4-stable ``` +OR + +For GitLab Enterprise Edition: + +```bash +sudo -u git -H git checkout 6-4-stable-ee +``` + + ### 3. Update gitlab-shell (and its config) ```bash From 1c629b62c7d5c473c01acc387391837dd5ec0c2a Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Wed, 12 Feb 2014 13:26:43 +0100 Subject: [PATCH 3/3] Remove empty lines. --- doc/update/6.1-to-6.2.md | 1 - doc/update/6.2-to-6.3.md | 1 - doc/update/6.3-to-6.4.md | 1 - 3 files changed, 3 deletions(-) diff --git a/doc/update/6.1-to-6.2.md b/doc/update/6.1-to-6.2.md index ae44b71e74..f389fcab8c 100644 --- a/doc/update/6.1-to-6.2.md +++ b/doc/update/6.1-to-6.2.md @@ -36,7 +36,6 @@ For GitLab Enterprise Edition: ```bash sudo -u git -H git checkout 6-2-stable-ee ``` -`` ### 3. Install additional packages diff --git a/doc/update/6.2-to-6.3.md b/doc/update/6.2-to-6.3.md index b56dc8d9d0..83585328c8 100644 --- a/doc/update/6.2-to-6.3.md +++ b/doc/update/6.2-to-6.3.md @@ -37,7 +37,6 @@ For GitLab Enterprise Edition: sudo -u git -H git checkout 6-3-stable-ee ``` - ### 3. Update gitlab-shell (and its config) ```bash diff --git a/doc/update/6.3-to-6.4.md b/doc/update/6.3-to-6.4.md index 3b7f7bc140..ff06c20255 100644 --- a/doc/update/6.3-to-6.4.md +++ b/doc/update/6.3-to-6.4.md @@ -32,7 +32,6 @@ For GitLab Enterprise Edition: sudo -u git -H git checkout 6-4-stable-ee ``` - ### 3. Update gitlab-shell (and its config) ```bash