Merge release version of Rubygems 2.7.0.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 5 insertions, 2 deletions

diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index c8f43e3805..d32df84be1 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -10,7 +10,7 @@ require 'rbconfig'
 require 'thread'
 
 module Gem
-  VERSION = "2.6.14"
+  VERSION = "2.7.0"
 end
 
 # Must be first since it unloads the prelude from 1.9.2
diff --git a/lib/rubygems/safe_yaml.rb b/lib/rubygems/safe_yaml.rb
index b98cfaa5e6..789bb5e25a 100644
--- a/lib/rubygems/safe_yaml.rb
+++ b/lib/rubygems/safe_yaml.rb
@@ -35,7 +35,10 @@ module Gem
         ::YAML.safe_load(input, [::Symbol])
       end
     else
-      warn "YAML safe loading is not available. Please upgrade psych to a version that supports safe loading (>= 2.0)."
+      unless Gem::Deprecate.skip
+        warn "YAML safe loading is not available. Please upgrade psych to a version that supports safe loading (>= 2.0)."
+      end
+
       def self.safe_load input, *args
         ::YAML.load input
       end