Add more ruby 2.5 compat fixes
This commit is contained in:
parent
eff5e491e4
commit
c37b12dff7
1 changed files with 12 additions and 6 deletions
18
debian/patches/0791-ruby2.5-compat.patch
vendored
18
debian/patches/0791-ruby2.5-compat.patch
vendored
|
@ -7,11 +7,9 @@ Subject: [PATCH] Fix ruby 2.5 compatibility (Thanks to Antonio Terceiro)
|
||||||
lib/gitlab/golang.rb | 2 +-
|
lib/gitlab/golang.rb | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/lib/gitlab/golang.rb b/lib/gitlab/golang.rb
|
|
||||||
index f2dc668c482a..34ff689eea4a 100644
|
|
||||||
--- a/lib/gitlab/golang.rb
|
--- a/lib/gitlab/golang.rb
|
||||||
+++ b/lib/gitlab/golang.rb
|
+++ b/lib/gitlab/golang.rb
|
||||||
@@ -33,7 +33,7 @@ module Gitlab
|
@@ -33,7 +33,7 @@
|
||||||
m = /\A(.*\.)?0\./.freeze.match pre
|
m = /\A(.*\.)?0\./.freeze.match pre
|
||||||
return false unless m
|
return false unless m
|
||||||
|
|
||||||
|
@ -20,6 +18,14 @@ index f2dc668c482a..34ff689eea4a 100644
|
||||||
end
|
end
|
||||||
|
|
||||||
# This pattern is intentionally more forgiving than the patterns
|
# This pattern is intentionally more forgiving than the patterns
|
||||||
--
|
--- a/lib/gitlab/gl_repository/identifier.rb
|
||||||
GitLab
|
+++ 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
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue