Drop ruby 2.5 compat patches, we have ruby 2.7 in fasttrack now

This commit is contained in:
Pirate Praveen 2020-07-14 13:17:52 +05:30
parent 9ea06aadb1
commit cbc0b1e267
2 changed files with 0 additions and 32 deletions

View file

@ -1,31 +0,0 @@
From fb7c85bb5a7c010a153afb2f0dff711ab3afdad5 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Tue, 30 Jun 2020 12:10:41 +0000
Subject: [PATCH] Fix ruby 2.5 compatibility (Thanks to Antonio Terceiro)
---
lib/gitlab/golang.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/lib/gitlab/golang.rb
+++ b/lib/gitlab/golang.rb
@@ -33,7 +33,7 @@
m = /\A(.*\.)?0\./.freeze.match pre
return false unless m
- pre = pre[m[0].length..]
+ pre = pre[m[0].length..-1]
end
# This pattern is intentionally more forgiving than the patterns
--- a/lib/gitlab/gl_repository/identifier.rb
+++ b/lib/gitlab/gl_repository/identifier.rb
@@ -49,7 +49,7 @@
end
def find_container_id
- id = Integer(segments[1], 10, exception: false)
+ id = Integer(segments[1], 10)
raise_error unless id

View file

@ -26,4 +26,3 @@
0750-fix-relative-paths.patch
0760-update-grape.patch
0790-protobuf-compat.patch
0791-ruby2.5-compat.patch