From 5021235fbb828727e42e4f9d6bd74c45d8a5e440 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 29 Dec 2015 09:27:34 +0530 Subject: [PATCH] gitlab: upgrade to CE v8.3.1 --- Changelog.md | 3 +++ Dockerfile | 2 +- assets/runtime/config/gitlabhq/gitlab.yml | 9 +++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 975fbaf1..d00dd2a4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,9 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) for the list of changes in GitLab. +**latest** +- gitlab: upgrade to CE v8.3.1 + **8.3.0-1** - fixed static asset routing when `GITLAB_RELATIVE_URL_ROOT` is used. diff --git a/Dockerfile b/Dockerfile index 4e1cd319..48194ee5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:14.04.20151213 MAINTAINER sameer@damagehead.com -ENV GITLAB_VERSION=8.3.0 \ +ENV GITLAB_VERSION=8.3.1 \ GITLAB_SHELL_VERSION=2.6.9 \ GITLAB_WORKHORSE_VERSION=0.5.1 \ GITLAB_USER="git" \ diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index f9aeb698..f6acf1b8 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -144,6 +144,15 @@ production: &base plain_url: "{{GITLAB_GRAVATAR_HTTP_URL}}" # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon ssl_url: "{{GITLAB_GRAVATAR_HTTPS_URL}}" # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon + ## Auxiliary jobs + # Periodically executed jobs, to self-heal Gitlab, do external synchronizations, etc. + # Please read here for more information: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job + cron_jobs: + # Flag stuck CI builds as failed + stuck_ci_builds_worker: + cron: "0 0 * * *" + + # # 2. GitLab CI settings # ==========================