Merged r21096 from trunk to 4.1-stable (#35621).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@21098 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index 1330bd3c25b58179ca4708812e0bf5ebf68c97bd..e72e7b9a1e38fdc365c0934828d68ce1ed1a27f6 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,7 @@ gem "bundler", ">= 1.5.0"
 
 gem 'rails', '5.2.6'
 gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5'
+gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0')
 gem "rouge", "~> 3.12.0"
 gem "request_store", "~> 1.4.1"
 gem "mini_mime", "~> 1.0.1"