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 /www/gitlab/files/patch-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 'www/gitlab/files/patch-Gemfile')
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 11c3e3c54daa..3c99e67715d8 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2018-04-23 19:39:01 UTC +--- Gemfile.orig 2018-05-28 11:47:11 UTC +++ Gemfile @@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0' gem 'default_value_for', gem_versions['default_value_for'] @@ -9,7 +9,7 @@ gem 'pg', '~> 0.18.2', group: :postgres gem 'rugged', '~> 0.27' -@@ -126,7 +126,7 @@ gem 'fog-rackspace', '~> 0.1.1' +@@ -125,7 +125,7 @@ gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.2.0' # for Google storage @@ -18,7 +18,7 @@ # for aws storage gem 'unf', '~> 0.1.4' -@@ -177,7 +177,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req +@@ -176,7 +176,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req gem 'rufus-scheduler', '~> 3.4' # HTTP requests @@ -27,7 +27,7 @@ # Colored output to console gem 'rainbow', '~> 2.2' -@@ -227,7 +227,7 @@ gem 'kubeclient', '~> 3.0' +@@ -226,7 +226,7 @@ gem 'kubeclient', '~> 3.0' gem 'd3_rails', '~> 3.5.0' # Sanitize user input @@ -36,7 +36,7 @@ gem 'babosa', '~> 1.0.2' # Sanitizes SVG input -@@ -289,7 +289,7 @@ gem 'batch-loader', '~> 1.2.1' +@@ -288,7 +288,7 @@ gem 'batch-loader', '~> 1.2.1' # Perf bar gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' @@ -45,7 +45,7 @@ gem 'peek-performance_bar', '~> 1.3.0' gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' -@@ -298,98 +298,11 @@ gem 'peek-sidekiq', '~> 1.0.3' +@@ -297,98 +297,11 @@ gem 'peek-sidekiq', '~> 1.0.3' # Metrics group :metrics do @@ -144,7 +144,7 @@ gem 'octokit', '~> 4.8' gem 'mail_room', '~> 0.9.1' -@@ -440,3 +353,4 @@ gem 'grape_logging', '~> 1.7' +@@ -439,3 +352,4 @@ gem 'grape_logging', '~> 1.7' # Asset synchronization gem 'asset_sync', '~> 2.2.0' |