aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--lib/rubygems.rb2
-rw-r--r--lib/rubygems/safe_yaml.rb5
3 files changed, 7 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 5fe79fc74b..c80d01df3d 100644
--- a/NEWS
+++ b/NEWS
@@ -189,7 +189,8 @@ with all sufficient information, see the ChangeLog file or Redmine
* Rubygems
- * Update Rubygems 2.6.14.
+ * Update Rubygems 2.7.0.
+ * http://blog.rubygems.org/2017/11/01/2.7.0-released.html
* http://blog.rubygems.org/2017/08/27/2.6.13-released.html
* http://blog.rubygems.org/2017/10/09/unsafe-object-deserialization-vulnerability.html
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