Merge branch 'gitlab-next'

Changelog.md

@@ -2,6 +2,8 @@
 
 **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

VERSION

@@ -1 +1 @@
-7.5.3
+7.6.0

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

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

assets/setup/install

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-GITLAB_VERSION=7.5.3
-GITLAB_SHELL_VERSION=2.2.0
+GITLAB_VERSION=7.6.0
+GITLAB_SHELL_VERSION=2.4.0
 
 GITLAB_HOME="/home/git"
 GITLAB_INSTALL_DIR="${GITLAB_HOME}/gitlab"