diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2018-05-31 13:48:39 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2018-05-31 13:48:39 +0000 |
| commit | b0e34e37f8ab326eef79fd65c3eb2399cf7a4c6d (patch) | |
| tree | b27a4342cda76c7d5c9f11506ea6acd9ee439966 /devel/gitaly/files/patch-ruby_Gemfile | |
| parent | Prefer USE_GCC=yes over USE_GCC=6+. As of today these two are equivalent, (diff) | |
Applied security upgrade to gitlab 10.7.5.
Fixed bug with wrong path for gitlab-workhouse that should fix artifacts (reported by Felix <mail@felix.flornet.de>). This was fix upstream but is not included in this version yet: https://gitlab.com/gitlab-org/gitlab-ce/issues/46763
Update net/rubygem-grpc to 1.11.1 which is required for gitlab 10.7.5.
Sync dep net/rubygem-grpc with gitlab which uses now 1.11.1.
Added gitlab-pages again to dependencies as the new version builds again.
Reported by: Felix <mail@felix.flornet.de>
Reviewed by: swills (mentor)
Approved by: swills (mentor)
Differential Revision: https://reviews.freebsd.org/D15631
Notes
Notes:
svn path=/head/; revision=471208
Diffstat (limited to 'devel/gitaly/files/patch-ruby_Gemfile')
| -rw-r--r-- | devel/gitaly/files/patch-ruby_Gemfile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index a9e922126d77..fb5c4f4c9ccf 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,6 +1,12 @@ --- ruby/Gemfile.orig 2018-04-12 00:44:37 UTC +++ ruby/Gemfile -@@ -13,12 +13,8 @@ gem 'sentry-raven', '~> 2.7.2', require: +@@ -8,17 +8,13 @@ gem 'activesupport', '~> 5.0.2' + gem 'rdoc', '~> 4.2' + gem 'gollum-lib', '~> 4.2', require: false + gem 'gollum-rugged_adapter', '~> 0.4.4', require: false +-gem 'grpc', '~> 1.10.0' ++gem 'grpc', '~> 1.11.0' + gem 'sentry-raven', '~> 2.7.2', require: false # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE |