From e2bb34571b01071b50b314c036e6b32303ce5be8 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Tue, 25 Mar 2014 17:53:15 +0100
Subject: [PATCH] Add update instructions for 6.7

---
 README.md     |  2 ++
 doc/update.md | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 0 deletions(-)

diff --git a/README.md b/README.md
index 1049c42..3a75ed1 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,8 @@ sudo gitlab-ctl reconfigure
 sudo lokkit -s http -s ssh
 ```
 
+## Updating
+
 For update instructions, see [the update guide](doc/update.md).
 
 ## How to manage an Omnibus-installed GitLab
diff --git a/doc/update.md b/doc/update.md
index c93ddb5..8bf6b66 100644
--- a/doc/update.md
+++ b/doc/update.md
@@ -1,5 +1,65 @@
 # Updating GitLab via omnibus-gitlab
 
+## Updating from GitLab 6.6.x to 6.7.x
+
+First, download the latest package from https://www.gitlab.com/downloads/ to your GitLab server.
+
+```shell
+# Stop unicorn and sidekiq so we can do database migrations
+sudo gitlab-ctl stop unicorn
+sudo gitlab-ctl stop sidekiq
+
+# Create a database backup in case the upgrade fails
+# Note the backup timestamp in case you want to revert later
+sudo gitlab-rake gitlab:backup:create
+
+# Install the latest package
+# Ubuntu:
+sudo dpkg -i gitlab_6.7.y-omnibus.xxx.deb
+# CentOS:
+sudo rpm -Uvh gitlab-6.7.y_xxx.rpm
+
+# Reconfigure GitLab (includes database migrations)
+sudo gitlab-ctl reconfigure
+
+# Start unicorn and sidekiq
+sudo gitlab-ctl start
+```
+
+Done!
+
+### Reverting to GitLab 6.6.x
+
+First download a GitLab 6.6.x package from https://www.gitlab.com/downloads/archives/ .
+
+```
+# Stop GitLab
+sudo gitlab-ctl stop unicorn
+sudo gitlab-ctl stop sidekiq
+
+# Downgrade GitLab to 6.6
+# Ubuntu
+sudo dpkg -r gitlab
+sudo dpkg -i gitlab-6.6.x-yyy.deb
+
+# CentOS:
+sudo rpm -e gitlab
+sudo rpm -ivh gitlab-6.6.x-yyy.rpm
+
+# Prepare GitLab for receiving the backup restore
+
+# Workaround for a backup restore bug in GitLab 6.6
+sudo -u gitlab-psql /opt/gitlab/embedded/bin/dropdb gitlabhq_production
+
+sudo gitlab-ctl reconfigure
+
+# Restore your backup
+sudo gitlab-rake gitlab:backup:restore BACKUP=12345 # where 12345 is your backup timestamp
+
+# Start GitLab
+sudo gitlab-ctl start
+```
+
 ## Updating from GitLab 6.6.0.pre1 to 6.6.4
 
 First, download the latest package from https://www.gitlab.com/downloads/ to your GitLab server.
--
libgit2 0.21.2