mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
Make sure gitlab uses a version of google-protobuf that works.
Version 3.15.x is causing segfaults. Problem is also reported upstream: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55972
This commit is contained in:
parent
50fcc35468
commit
a85fc45cea
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=567833
2 changed files with 17 additions and 6 deletions
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= gitlab-ce
|
||||
PORTVERSION= 13.9.2
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= www devel
|
||||
|
||||
MAINTAINER= mfechner@FreeBSD.org
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
|
||||
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
|
||||
gem 'thrift', '>= 0.14.0'
|
||||
@@ -332,102 +331,11 @@ gem 'snowplow-tracker', '~> 0.6.1'
|
||||
@@ -332,104 +331,13 @@ gem 'snowplow-tracker', '~> 0.6.1'
|
||||
# Metrics
|
||||
group :metrics do
|
||||
gem 'method_source', '~> 1.0', require: false
|
||||
|
@ -63,8 +63,8 @@
|
|||
# Prometheus
|
||||
gem 'prometheus-client-mmap', '~> 0.12.0'
|
||||
gem 'raindrops', '~> 0.18'
|
||||
-end
|
||||
-
|
||||
end
|
||||
|
||||
-group :development do
|
||||
- gem 'brakeman', '~> 4.2', require: false
|
||||
- gem 'danger', '~> 8.0.6', require: false
|
||||
|
@ -154,6 +154,17 @@
|
|||
-
|
||||
- # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
|
||||
- gem 'derailed_benchmarks', require: false
|
||||
end
|
||||
|
||||
-end
|
||||
-
|
||||
gem 'octokit', '~> 4.15'
|
||||
|
||||
# https://gitlab.com/gitlab-org/gitlab/issues/207207
|
||||
@@ -473,7 +381,7 @@ gem 'gitaly', '~> 13.9.0.pre.rc1'
|
||||
|
||||
gem 'grpc', '~> 1.30.2'
|
||||
|
||||
-gem 'google-protobuf', '~> 3.12'
|
||||
+gem 'google-protobuf', '~> 3.14.0'
|
||||
|
||||
gem 'toml-rb', '~> 1.0.0'
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue