Merge branch 'gitlab-next'

Changelog.md

@@ -2,6 +2,10 @@
 
 This file only reflects the changes that are made in the the docker image. Please refer to the upstream GitLab [CHANGELOG](https://github.com/gitlabhq/gitlabhq/blob/master/CHANGELOG) for the list of changes in GitLab.
 
+**latest**
+- gitlab-shell: upgrade to v.2.6.4
+- gitlab: upgrade to CE v.7.14.0
+
 **7.13.5**
 - gitlab: upgrade to CE v.7.13.5
 

Dockerfile

@@ -1,8 +1,8 @@
 FROM sameersbn/ubuntu:14.04.20150816
 MAINTAINER sameer@damagehead.com
 
-ENV GITLAB_VERSION=7.13.5 \
-    GITLAB_SHELL_VERSION=2.6.3 \
+ENV GITLAB_VERSION=7.14.0 \
+    GITLAB_SHELL_VERSION=2.6.4 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

assets/config/gitlab-shell/config.yml

@@ -1,3 +1,8 @@
+#
+# If you change this file in a Merge Request, please also create
+# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+#
+
 # GitLab user. git by default
 user: git
 

assets/config/gitlabhq/gitlab.yml

@@ -209,20 +209,21 @@ 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:
-      - { name: 'google_oauth2', app_id: '{{OAUTH_GOOGLE_API_KEY}}',
+      - { name: 'google_oauth2', label: 'Google', app_id: '{{OAUTH_GOOGLE_API_KEY}}',
           app_secret: '{{OAUTH_GOOGLE_APP_SECRET}}',
           args: { access_type: 'offline', approval_prompt: '{{OAUTH_GOOGLE_APPROVAL_PROMPT}}', hd: '{{OAUTH_GOOGLE_RESTRICT_DOMAIN}}' } }
       - { name: 'twitter', app_id: '{{OAUTH_TWITTER_API_KEY}}',
           app_secret: '{{OAUTH_TWITTER_APP_SECRET}}'}
-      - { name: 'github', app_id: '{{OAUTH_GITHUB_API_KEY}}',
+      - { name: 'github', label: 'GitHub', app_id: '{{OAUTH_GITHUB_API_KEY}}',
           app_secret: '{{OAUTH_GITHUB_APP_SECRET}}',
           args: { scope: '{{OAUTH_GITHUB_SCOPE}}' } }
-      - { name: 'gitlab', app_id: '{{OAUTH_GITLAB_API_KEY}}',
+      - { name: 'gitlab', label: 'GitLab.com', app_id: '{{OAUTH_GITLAB_API_KEY}}',
           app_secret: '{{OAUTH_GITLAB_APP_SECRET}}',
           args: { scope: '{{OAUTH_GITLAB_SCOPE}}' } }
       - { name: 'bitbucket', app_id: '{{OAUTH_BITBUCKET_API_KEY}}',
           app_secret: '{{OAUTH_BITBUCKET_APP_SECRET}}'}
       - { name: 'saml',
+          label: 'Our SAML Provider',
           args: {
                   assertion_consumer_service_url: '{{OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL}}',
                   idp_cert_fingerprint: '{{OAUTH_SAML_IDP_CERT_FINGERPRINT}}',