From d1428a0fd5eb7a3ddbf4ab431ff524efce366ccc Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Wed, 24 Dec 2014 20:55:42 +0530
Subject: [PATCH] gitlab: upgrade to CE v.7.6.1

---
 Changelog.md                      |  1 +
 VERSION                           |  2 +-
 assets/config/gitlabhq/unicorn.rb | 14 +++++++-------
 assets/setup/install              |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 64f3ca37..52940ec8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,7 @@
 **latest**
 - disable nginx ipv6 if host does not support it.
 - init: added GITLAB_BACKUP_TIME configuration option
+- gitlab: upgrade to CE v.7.6.1
 
 **7.6.0**
 - add support for configuring piwik
diff --git a/VERSION b/VERSION
index 93c8ddab..e8be6840 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.6.0
+7.6.1
diff --git a/assets/config/gitlabhq/unicorn.rb b/assets/config/gitlabhq/unicorn.rb
index f79c8aaa..e0a7d5e1 100644
--- a/assets/config/gitlabhq/unicorn.rb
+++ b/assets/config/gitlabhq/unicorn.rb
@@ -13,9 +13,9 @@
 #
 ENV['RAILS_RELATIVE_URL_ROOT'] = "{{GITLAB_RELATIVE_URL_ROOT}}"
 
-# Use at least one worker per core if you're on a dedicated server,
-# more will usually help for _short_ waits on databases/caches.
-# The minimum is 2
+# Read about unicorn workers here:
+# http://doc.gitlab.com/ee/install/requirements.html#unicorn-workers
+#
 worker_processes {{UNICORN_WORKERS}}
 
 # Since Unicorn is never exposed to outside clients, it does not need to
@@ -37,10 +37,10 @@ listen "127.0.0.1:8080", :tcp_nopush => true
 
 # nuke workers after 30 seconds instead of 60 seconds (the default)
 #
-# NOTICE: git push over http depends on this value. 
-# If you want be able to push huge amount of data to git repository over http 
-# you will have to increase this value too. 
-# 
+# NOTICE: git push over http depends on this value.
+# If you want be able to push huge amount of data to git repository over http
+# you will have to increase this value too.
+#
 # Example of output if you try to push 1GB repo to GitLab over http.
 #   -> git push http://gitlab.... master
 #
diff --git a/assets/setup/install b/assets/setup/install
index 30d39376..3553b4fd 100755
--- a/assets/setup/install
+++ b/assets/setup/install
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-GITLAB_VERSION=7.6.0
+GITLAB_VERSION=7.6.1
 GITLAB_SHELL_VERSION=2.4.0
 
 GITLAB_HOME="/home/git"