From 3e67231e3315213fb71ab9438cc017c815efbde8 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Tue, 23 Dec 2014 12:45:52 +0530
Subject: [PATCH] gitlab: upgrade to CE v.7.6.0

---
 Changelog.md                      | 1 +
 VERSION                           | 2 +-
 assets/config/gitlabhq/gitlab.yml | 2 +-
 assets/config/gitlabhq/unicorn.rb | 1 +
 assets/setup/install              | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ba72619b..66de657c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,7 @@
 **latest**
 - add support for configuring piwik
 - gitlab-shell: upgrade to v.2.4.0
+- gitlab: upgrade to CE v.7.6.0
 
 **7.5.3**
 - accept `BACKUP` parameter while running the restore rake task, closes #220
diff --git a/VERSION b/VERSION
index 017f8006..93c8ddab 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.5.3
+7.6.0
diff --git a/assets/config/gitlabhq/gitlab.yml b/assets/config/gitlabhq/gitlab.yml
index c82bf291..c75d1c34 100644
--- a/assets/config/gitlabhq/gitlab.yml
+++ b/assets/config/gitlabhq/gitlab.yml
@@ -35,7 +35,7 @@ production: &base
 
     ## Date & Time settings
     # Uncomment and customize if you want to change the default time zone of GitLab application.
-    # To see all available zones, run `bundle exec rake time:zones:all`
+    # To see all available zones, run `bundle exec rake time:zones:all RAILS_ENV=production`
     time_zone: "{{GITLAB_TIMEZONE}}"
 
     ## Email settings
diff --git a/assets/config/gitlabhq/unicorn.rb b/assets/config/gitlabhq/unicorn.rb
index 900049cb..f79c8aaa 100644
--- a/assets/config/gitlabhq/unicorn.rb
+++ b/assets/config/gitlabhq/unicorn.rb
@@ -15,6 +15,7 @@ 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
 worker_processes {{UNICORN_WORKERS}}
 
 # Since Unicorn is never exposed to outside clients, it does not need to
diff --git a/assets/setup/install b/assets/setup/install
index cc961a72..30d39376 100755
--- a/assets/setup/install
+++ b/assets/setup/install
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-GITLAB_VERSION=7.5.3
+GITLAB_VERSION=7.6.0
 GITLAB_SHELL_VERSION=2.4.0
 
 GITLAB_HOME="/home/git"