aboutsummaryrefslogtreecommitdiff
path: root/www/gitlab-ce
diff options
context:
space:
mode:
authorMatthias Fechner <mfechner@FreeBSD.org>2019-01-09 22:09:00 +0000
committerMatthias Fechner <mfechner@FreeBSD.org>2019-01-09 22:09:00 +0000
commitb6ee2631b53f7235199905cde4de1fe9dc0efac5 (patch)
treed9d8e4533d31f763489d7b498a2da45a6eb5b2cc /www/gitlab-ce
parent2f4556f268edc6842c7a94dbbe328919f17ea349 (diff)
downloadports-b6ee2631b53f7235199905cde4de1fe9dc0efac5.tar.gz
ports-b6ee2631b53f7235199905cde4de1fe9dc0efac5.zip
Upgrade to version 11.6.3.
Notes
Notes: svn path=/head/; revision=489831
Diffstat (limited to 'www/gitlab-ce')
-rw-r--r--www/gitlab-ce/Makefile6
-rw-r--r--www/gitlab-ce/distinfo6
-rw-r--r--www/gitlab-ce/files/patch-Gemfile11
-rw-r--r--www/gitlab-ce/pkg-plist1
4 files changed, 9 insertions, 15 deletions
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 26f6b8737eb2..8936a3cf3bc5 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gitlab-ce
-PORTVERSION= 11.6.1
+PORTVERSION= 11.6.3
CATEGORIES= www devel
MAINTAINER= mfechner@FreeBSD.org
@@ -113,7 +113,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \
rubygem-sidekiq>=5.2.1:devel/rubygem-sidekiq \
rubygem-sidekiq-cron0>=0.6.0:devel/rubygem-sidekiq-cron0 \
rubygem-redis-namespace>=1.6.0:databases/rubygem-redis-namespace \
- rubygem-gitlab-sidekiq-fetcher>0.1.0:devel/rubygem-gitlab-sidekiq-fetcher \
+ rubygem-gitlab-sidekiq-fetcher>=0.4.0:devel/rubygem-gitlab-sidekiq-fetcher \
rubygem-rufus-scheduler342>=3.4.0:devel/rubygem-rufus-scheduler342 \
rubygem-httparty>=0.13.3:www/rubygem-httparty \
rubygem-rainbow>=3.0:devel/rubygem-rainbow \
@@ -219,7 +219,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= 598c5a7b9ddc0afbd0890d79c82088b80d706483
+GL_COMMIT= bc9391c294422742a7c0f904cbac4e841a73ae9e
USERS= git
GROUPS= git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index fcc6a91045e4..42bd130dfb93 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546421131
-SHA256 (gitlab-org-gitlab-ce-598c5a7b9ddc0afbd0890d79c82088b80d706483_GL0.tar.gz) = a393c1e44d1bcbafad147180c1183a42178ebba8095747b6ceb7e14ecf884d51
-SIZE (gitlab-org-gitlab-ce-598c5a7b9ddc0afbd0890d79c82088b80d706483_GL0.tar.gz) = 49847798
+TIMESTAMP = 1547070040
+SHA256 (gitlab-org-gitlab-ce-bc9391c294422742a7c0f904cbac4e841a73ae9e_GL0.tar.gz) = c397c2eb49a0fb5e232e2e881bc547ffcfeeb2eb8fa9c4e75dfc73a43c50b65e
+SIZE (gitlab-org-gitlab-ce-bc9391c294422742a7c0f904cbac4e841a73ae9e_GL0.tar.gz) = 49849558
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index cc1163aa9629..52cdf7e7ca1e 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig 2018-12-21 14:23:37 UTC
+--- Gemfile.orig 2019-01-04 23:19:12 UTC
+++ Gemfile
@@ -5,7 +5,7 @@ end
@@ -18,14 +18,7 @@
gem 'pg', '~> 0.18.2', group: :postgres
gem 'rugged', '~> 0.27'
-@@ -181,13 +181,13 @@ gem 'acts-as-taggable-on', '~> 5.0'
- gem 'sidekiq', '~> 5.2.1'
- gem 'sidekiq-cron', '~> 0.6.0'
- gem 'redis-namespace', '~> 1.6.0'
--gem 'gitlab-sidekiq-fetcher', '~> 0.1.0', require: 'sidekiq-reliable-fetch'
-+gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
-
- # Cron Parser
+@@ -187,7 +187,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'si
gem 'rufus-scheduler', '~> 3.4'
# HTTP requests
diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist
index 1dffc4c06126..8365e593beac 100644
--- a/www/gitlab-ce/pkg-plist
+++ b/www/gitlab-ce/pkg-plist
@@ -12136,6 +12136,7 @@
%%WWWDIR%%/spec/graphql/types/query_type_spec.rb
%%WWWDIR%%/spec/graphql/types/time_type_spec.rb
%%WWWDIR%%/spec/helpers/application_helper_spec.rb
+%%WWWDIR%%/spec/helpers/application_settings_helper_spec.rb
%%WWWDIR%%/spec/helpers/auth_helper_spec.rb
%%WWWDIR%%/spec/helpers/auto_devops_helper_spec.rb
%%WWWDIR%%/spec/helpers/avatars_helper_spec.rb