diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2024-04-01 04:42:41 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2024-04-02 09:32:09 +0000 |
| commit | 8c5b73b52ebb3f034cc7a11fe1eb0e13e87a84ff (patch) | |
| tree | 499a6e582c8477dfd877d41ecba197a745cf789b | |
| parent | 0d493e00aa0232157f6dd0be5a41733ea4a3b9aa (diff) | |
| download | ports-8c5b73b52ebb3f034cc7a11fe1eb0e13e87a84ff.tar.gz ports-8c5b73b52ebb3f034cc7a11fe1eb0e13e87a84ff.zip | |
www/gitlab-ce: fix regression
987cdaf724929857c6e2199513121ddea3dcaf83
gitlab expects rack version 2.2.8.1, see also attach PR.
PR: 277982
| -rw-r--r-- | www/gitlab-ce/files/patch-Gemfile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 74417b44eeea..ce181c3a12c6 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2024-03-20 12:36:02 UTC +--- Gemfile.orig 2024-03-27 08:20:26 UTC +++ Gemfile @@ -58,7 +58,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss @@ -59,7 +59,13 @@ gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory -@@ -245,7 +245,7 @@ gem 'rack', '~> 2.2.8.1' # rubocop:todo Gemfile/Missin +@@ -240,12 +240,12 @@ gem 'diffy', '~> 3.4' # rubocop:todo Gemfile/MissingFe + gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems/diff_match_patch', feature_category: :team_planning + + # Application server +-gem 'rack', '~> 2.2.8.1' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'rack', '~> 2.2.8', '>= 2.2.8.1' # rubocop:todo Gemfile/MissingFeatureCategory + # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory group :puma do |