aboutsummaryrefslogtreecommitdiff
path: root/www/gitlab-ce
diff options
context:
space:
mode:
authorMatthias Fechner <mfechner@FreeBSD.org>2019-03-20 13:58:56 +0000
committerMatthias Fechner <mfechner@FreeBSD.org>2019-03-20 13:58:56 +0000
commit4af19f5211fc4e9c03c5af6e086a305baf52b265 (patch)
tree0ab2dc3f48f2439f982bb9b7e00171d6e755da9b /www/gitlab-ce
parent3d00b61e93b131f9a46435b0d5455e931ee6d3ea (diff)
downloadports-4af19f5211fc4e9c03c5af6e086a305baf52b265.tar.gz
ports-4af19f5211fc4e9c03c5af6e086a305baf52b265.zip
Update to 11.8.2.
Notes
Notes: svn path=/head/; revision=496342
Diffstat (limited to 'www/gitlab-ce')
-rw-r--r--www/gitlab-ce/Makefile4
-rw-r--r--www/gitlab-ce/distinfo6
-rw-r--r--www/gitlab-ce/files/patch-Gemfile10
-rw-r--r--www/gitlab-ce/files/patch-config_gitlab.yml.example12
4 files changed, 20 insertions, 12 deletions
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 5a81c9ef4ad1..e24da12a774b 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gitlab-ce
-PORTVERSION= 11.8.1
+PORTVERSION= 11.8.2
CATEGORIES= www devel
MAINTAINER= mfechner@FreeBSD.org
@@ -221,7 +221,7 @@ USE_RC_SUBR= gitlab
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags
-GL_COMMIT= 657d5085256165ceaeb443891f8e14eeba82aaba
+GL_COMMIT= b1268e93775a992c990a8d378491b19c59463545
USERS= git
GROUPS= git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 367969ab62bd..4469c97a3dfd 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551781513
-SHA256 (gitlab-org-gitlab-ce-657d5085256165ceaeb443891f8e14eeba82aaba_GL0.tar.gz) = 45067f2421b31d375797dc913299404b48872d6b0ae9d195204b81a422f56584
-SIZE (gitlab-org-gitlab-ce-657d5085256165ceaeb443891f8e14eeba82aaba_GL0.tar.gz) = 53480669
+TIMESTAMP = 1553064692
+SHA256 (gitlab-org-gitlab-ce-b1268e93775a992c990a8d378491b19c59463545_GL0.tar.gz) = de42a38eac17ec5acd5d41e3c57e5953b7f4b122a7ed422fcba666d6c423f160
+SIZE (gitlab-org-gitlab-ce-b1268e93775a992c990a8d378491b19c59463545_GL0.tar.gz) = 53483067
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index 27a472c23d4d..9092cf1e7f94 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,5 +1,13 @@
---- Gemfile.orig 2019-02-22 06:34:59 UTC
+--- Gemfile.orig 2019-03-13 16:32:44 UTC
+++ Gemfile
+@@ -1,6 +1,6 @@
+ source 'https://rubygems.org'
+
+-gem 'rails', '5.0.7.1'
++gem 'rails', '5.0.7.2'
+ gem 'rails-deprecated_sanitizer', '~> 1.0.3'
+
+ # Improves copy-on-write performance for MRI
@@ -15,7 +15,7 @@ gem 'sprockets', '~> 3.7.0'
gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example
index e0b903a82809..5c9176a6f74a 100644
--- a/www/gitlab-ce/files/patch-config_gitlab.yml.example
+++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example
@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig 2019-01-21 20:21:36 UTC
+--- config/gitlab.yml.example.orig 2019-03-13 16:32:44 UTC
+++ config/gitlab.yml.example
-@@ -231,7 +231,7 @@ production: &base
+@@ -248,7 +248,7 @@ production: &base
# external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages
# external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages
admin:
@@ -9,7 +9,7 @@
## Mattermost
## For enabling Add to Mattermost button
-@@ -593,7 +593,7 @@ production: &base
+@@ -610,7 +610,7 @@ production: &base
# Gitaly settings
gitaly:
# Path to the directory containing Gitaly client executables.
@@ -18,7 +18,7 @@
# Default Gitaly authentication token. Can be overridden per storage. Can
# be left blank when Gitaly is running locally on a Unix socket, which
# is the normal way to deploy Gitaly.
-@@ -611,8 +611,8 @@ production: &base
+@@ -628,8 +628,8 @@ production: &base
# real path not the symlink.
storages: # You must have at least a `default` storage path.
default:
@@ -29,7 +29,7 @@
# gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
## Backup settings
-@@ -640,12 +640,12 @@ production: &base
+@@ -661,12 +661,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -45,7 +45,7 @@
# Git over HTTP
upload_pack: true
-@@ -666,7 +666,7 @@ production: &base
+@@ -687,7 +687,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git: