From df27d2cebbb6d9cf02ed0737f6ddfaddb2f123ff Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Fri, 22 Jan 2016 18:27:07 +0530
Subject: [PATCH] gitlab: upgrade to CE v8.4.0

---
 Changelog.md                              |  1 +
 Dockerfile                                |  2 +-
 assets/runtime/config/gitlabhq/gitlab.yml | 16 ++++++++++++++--
 assets/runtime/functions                  |  5 +++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8b0df5cd..2b3b2d7a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ This file only reflects the changes that are made in this image. Please refer to
 **latest**
 - gitlab-shell: upgrade to v.2.6.10
 - gitlab-workhorse: upgrade to v0.6.1
+- gitlab: upgrade to CE v8.4.0
 
 **8.3.4**
 - gitlab-workhorse: upgrade to v0.5.4
diff --git a/Dockerfile b/Dockerfile
index d7c58c66..f1a0f540 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM sameersbn/ubuntu:14.04.20160121
 MAINTAINER sameer@damagehead.com
 
-ENV GITLAB_VERSION=8.3.4 \
+ENV GITLAB_VERSION=8.4.0 \
     GITLAB_SHELL_VERSION=2.6.10 \
     GITLAB_WORKHORSE_VERSION=0.6.1 \
     GITLAB_USER="git" \
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index e80aa113..fd40b003 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -4,8 +4,8 @@
 #
 ###########################  NOTE  #####################################
 # This file should not receive new settings. All configuration options #
-# that do not require an application restart are being moved to        #
-# ApplicationSetting model!                                            #
+# * are being moved to ApplicationSetting model!                       #
+# If a setting requires an application restart say so in that screen.  #
 # If you change this file in a Merge Request, please also create       #
 # a MR on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests  #
 ########################################################################
@@ -301,6 +301,15 @@ production: &base
     # arguments, followed by optional 'args' which can be either a hash or an array.
     # Documentation for this is available at http://doc.gitlab.com/ce/integration/omniauth.html
     providers:
+      # See omniauth-cas3 for more configuration details
+      # - { name: 'cas3',
+      #     label: 'cas3',
+      #     args: {
+      #             url: 'https://sso.example.com',
+      #             disable_ssl_verification: false,
+      #             login_url: '/cas/login',
+      #             service_validate_url: '/cas/p3/serviceValidate',
+      #             logout_url: '/cas/logout'} }
       - { name: 'github',
           label: 'GitHub',
           app_id: '{{OAUTH_GITHUB_API_KEY}}',
@@ -339,6 +348,9 @@ production: &base
             application_name: '{{OAUTH_CROWD_APP_NAME}}',
             application_password: '{{OAUTH_CROWD_APP_PASSWORD}}' } }
 
+    # SSO maximum session duration in seconds. Defaults to CAS default of 8 hours.
+    # cas3:
+    #   session_duration: 28800
 
   # Shared file storage settings
   shared:
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 2acb81de..bec0d60d 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1120,6 +1120,11 @@ migrate_database() {
 
     echo "Migrating database..."
     exec_as_git bundle exec rake db:migrate >/dev/null
+
+    if [[ ${DB_ADAPTER} == mysql2 ]]; then
+      exec_as_git bundle exec rake add_limits_mysql >/dev/null
+    fi
+
     echo "${GITLAB_VERSION}" > ${GITLAB_DATA_DIR}/tmp/VERSION
     rm -rf ${GITLAB_DATA_DIR}/tmp/GITLAB_RELATIVE_URL_ROOT # force cache cleanup
   fi