From 08e52b08073fdba741b79206d79c4b26528fd1c5 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 22 Apr 2013 12:38:50 +0200
Subject: [PATCH 1/5] Fix version mismatch for installations docs
---
doc/install/installation.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/install/installation.md b/doc/install/installation.md
index d1d3833e3d2..002d8c596f4 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -132,10 +132,10 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
cd /home/git/gitlab
# Checkout to stable release
- sudo -u git -H git checkout 5-0-stable
+ sudo -u git -H git checkout 5-1-stable
**Note:**
-You can change `5-0-stable` to `master` if you want the *bleeding edge* version, but
+You can change `5-1-stable` to `master` if you want the *bleeding edge* version, but
do so with caution!
## Configure it
@@ -200,7 +200,7 @@ Make sure to update username/password in config/database.yml.
Download the init script (will be /etc/init.d/gitlab):
- sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab
+ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/5-1-stable/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
Make GitLab start on boot:
@@ -241,7 +241,7 @@ If you can't or don't want to use Nginx as your web server, have a look at the
Download an example site config:
- sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/master/nginx/gitlab
+ sudo curl --output /etc/nginx/sites-available/gitlab https://raw.github.com/gitlabhq/gitlab-recipes/5-1-stable/nginx/gitlab
sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab
Make sure to edit the config file to match your setup:
--
GitLab
From 80efbf8544d636acbc3a56c6b3c77a80e33efd04 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 22 Apr 2013 16:13:04 +0300
Subject: [PATCH 2/5] Replace unicorn with puma
---
doc/install/installation.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 002d8c596f4..90f93e84db6 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -162,8 +162,8 @@ do so with caution!
sudo -u git -H mkdir tmp/pids/
sudo chmod -R u+rwX tmp/pids/
- # Copy the example Unicorn config
- sudo -u git -H cp config/unicorn.rb.example config/unicorn.rb
+ # Copy the example Of Puma config
+ sudo -u git -H cp config/puma.rb.example config/puma.rb
**Important Note:**
Make sure to edit both files to match your setup.
--
GitLab
From d4e7aa4fe089eb6a4eef1da33d8ec124a4b7aba0 Mon Sep 17 00:00:00 2001
From: Sato Hiroyuki <sathiroyuki@gmail.com>
Date: Tue, 23 Apr 2013 09:23:59 +0900
Subject: [PATCH 3/5] Fix error "Address already in use".
---
doc/update/5.0-to-5.1.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/doc/update/5.0-to-5.1.md b/doc/update/5.0-to-5.1.md
index 438bc25672c..f9fbeaf7870 100644
--- a/doc/update/5.0-to-5.1.md
+++ b/doc/update/5.0-to-5.1.md
@@ -19,6 +19,7 @@ sudo -u git -H git checkout 5-1-stable
### 3. Install libs, migrations etc
```
+sudo rm tmp/sockets/gitlab.socket
sudo -u git -H cp config/puma.rb.example config/puma.rb
--
GitLab
From 4faf64a9a101cb5748617834932576dc1f4d3b1a Mon Sep 17 00:00:00 2001
From: Daniel Nieto <daniel.nieto@ironbit.net>
Date: Tue, 23 Apr 2013 17:03:29 -0500
Subject: [PATCH 4/5] 5.0-to-5.1.md - gitlab-shell update instructions.
---
doc/update/5.0-to-5.1.md | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/doc/update/5.0-to-5.1.md b/doc/update/5.0-to-5.1.md
index f9fbeaf7870..d3abe462971 100644
--- a/doc/update/5.0-to-5.1.md
+++ b/doc/update/5.0-to-5.1.md
@@ -16,7 +16,15 @@ sudo -u git -H git checkout 5-1-stable
```
-### 3. Install libs, migrations etc
+### 3. Update gitlab-shell
+
+```
+cd /home/git/gitlab-shell
+sudo -u git -H git fetch
+sudo -u git -H git checkout v1.3.0
+```
+
+### 4. Install libs, migrations etc
```
sudo rm tmp/sockets/gitlab.socket
@@ -29,7 +37,7 @@ sudo -u git -H bundle exec rake migrate_merge_requests RAILS_ENV=production
```
-### 4. Update init.d script with a new one
+### 5. Update init.d script with a new one
```bash
# init.d
@@ -38,6 +46,6 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-rec
sudo chmod +x /etc/init.d/gitlab
```
-### 5. Start application
+### 6. Start application
sudo service gitlab start
--
GitLab
From 87aed8d4b93fa037f2cd55b9f6f342f40cc015f9 Mon Sep 17 00:00:00 2001
From: David Greaves <david@dgreaves.com>
Date: Wed, 24 Apr 2013 18:28:08 +0100
Subject: [PATCH 5/5] Make absolutely sure we're in the right place when
executing commands that depend on CWD
Signed-off-by: David Greaves <david.greaves@jollamobile.com>
---
doc/update/5.0-to-5.1.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/doc/update/5.0-to-5.1.md b/doc/update/5.0-to-5.1.md
index d3abe462971..5e10bf16699 100644
--- a/doc/update/5.0-to-5.1.md
+++ b/doc/update/5.0-to-5.1.md
@@ -10,7 +10,7 @@
### 2. get latest code
```
-
+cd /home/git/gitlab
sudo -u git -H git fetch
sudo -u git -H git checkout 5-1-stable
@@ -27,6 +27,7 @@ sudo -u git -H git checkout v1.3.0
### 4. Install libs, migrations etc
```
+cd /home/git/gitlab
sudo rm tmp/sockets/gitlab.socket
sudo -u git -H cp config/puma.rb.example config/puma.rb
--
GitLab