Merged r20858 from trunk to 4.0-stable (#34966).

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

diff --git a/Gemfile b/Gemfile
index 3c5eac111ded3127e8b1243876b72d6062a6de7d..6ebdedb4bfbdba0c17a6b50bf54e6c72cc37e62a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0'
 gem "bundler", ">= 1.5.0"
 
-gem 'rails', '5.2.4.5'
+gem 'rails', '5.2.5'
 gem "rouge", "~> 3.3.0"
 gem "request_store", "1.0.5"
 gem "mini_mime", "~> 1.0.1"