diff --git a/Changelog.md b/Changelog.md index 9280c2d6..56c7e7cc 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ This file only reflects the changes that are made in the the docker image. Pleas **latest** - expose SAML OAuth provider configuration - expose `OAUTH_AUTO_SIGN_IN_WITH_PROVIDER` configuration +- gitlab: upgrade to CE v.7.13.0 **7.12.2-2** - enable persistence `.secret` file used in 2FA diff --git a/Dockerfile b/Dockerfile index 326cf563..d2845876 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:14.04.20150712 MAINTAINER sameer@damagehead.com -ENV GITLAB_VERSION=7.12.2 \ +ENV GITLAB_VERSION=7.13.0 \ GITLAB_SHELL_VERSION=2.6.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ diff --git a/assets/config/gitlabhq/gitlab.yml b/assets/config/gitlabhq/gitlab.yml index 19fe84d2..0dd57eb2 100644 --- a/assets/config/gitlabhq/gitlab.yml +++ b/assets/config/gitlabhq/gitlab.yml @@ -60,14 +60,15 @@ production: &base # Email server smtp settings are in config/initializers/smtp_settings.rb.sample - default_can_create_group: {{GITLAB_CREATE_GROUP}} # default: true - username_changing_enabled: {{GITLAB_USERNAME_CHANGE}} # default: true - User can change her username/namespace - ## Default theme - ## BASIC = 1 - ## MARS = 2 - ## MODERN = 3 - ## GRAY = 4 - ## COLOR = 5 + # default_can_create_group: false # default: true + # username_changing_enabled: false # default: true - User can change her username/namespace + ## Default theme ID + ## 1 - Graphite + ## 2 - Charcoal + ## 3 - Green + ## 4 - Gray + ## 5 - Violet + ## 6 - Blue # default_theme: 2 # default: 2 ## Automatic issue closing