diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-03-09 16:13:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-09 16:13:11 -0500 |
| commit | 38c7ddd4e9f3f22f67d9615dd04a2ae9525824fb (patch) | |
| tree | 4f30d3f3d443f7000e1a8bd14078b08d5809a16f | |
| parent | f8272402377a0530d5fa9250e32868b8088eb80b (diff) | |
| parent | 875073a89df106a9d8eb32465e2232feab420f18 (diff) | |
| download | rails-38c7ddd4e9f3f22f67d9615dd04a2ae9525824fb.tar.gz rails-38c7ddd4e9f3f22f67d9615dd04a2ae9525824fb.tar.bz2 rails-38c7ddd4e9f3f22f67d9615dd04a2ae9525824fb.zip | |
Merge pull request #32216 from Gaurav2728/update-psych-gem
update psych gem to 3.2 stable release
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -150,7 +150,7 @@ end platforms :rbx do # The rubysl-yaml gem doesn't ship with Psych by default as it needs # libyaml that isn't always available. - gem "psych", "~> 2.0" + gem "psych", "~> 3.0" end # Gems that are necessary for Active Record tests with Oracle. diff --git a/Gemfile.lock b/Gemfile.lock index 5c93085395..58d751c4c3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -340,7 +340,7 @@ GEM pg (1.0.0-x64-mingw32) pg (1.0.0-x86-mingw32) powerpack (0.1.1) - psych (2.2.4) + psych (3.0.2) public_suffix (3.0.1) puma (3.9.1) puma (3.9.1-java) @@ -525,7 +525,7 @@ DEPENDENCIES mysql2 (>= 0.4.10) nokogiri (>= 1.8.1) pg (>= 0.18.0) - psych (~> 2.0) + psych (~> 3.0) puma que queue_classic! |