Merge pull request #10113 from opf/fix/bump_gems

Fix/bump gems
opf · Jan 28, 2022 · 0783470 · 0783470
2 parents c1cf54e + 63cf717
commit 0783470
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Gemfile b/Gemfile
@@ -206,7 +206,7 @@ group :test do
   gem 'rack_session_access'
   gem 'rspec', '~> 3.10.0'
   # also add to development group, so "spec" rake task gets loaded
-  gem 'rspec-rails', '~> 5.0.0', group: :development
+  gem 'rspec-rails', '~> 5.1.0', group: :development
 
   # Retry failures within the same environment
   gem 'retriable', '~> 3.1.1'
@@ -299,7 +299,7 @@ gem 'disposable', '~> 0.6.2'
 
 platforms :mri, :mingw, :x64_mingw do
   group :postgres do
-    gem 'pg', '~> 1.2.2'
+    gem 'pg', '~> 1.3.0'
   end
 
   # Support application loading when no database exists yet.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -278,7 +278,7 @@ GEM
     awesome_nested_set (3.4.0)
       activerecord (>= 4.0.0, < 7.0)
     aws-eventstream (1.2.0)
-    aws-partitions (1.549.0)
+    aws-partitions (1.550.0)
     aws-sdk-core (3.125.5)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
@@ -287,7 +287,7 @@ GEM
     aws-sdk-kms (1.53.0)
       aws-sdk-core (~> 3, >= 3.125.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.111.2)
+    aws-sdk-s3 (1.111.3)
       aws-sdk-core (~> 3, >= 3.125.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -542,7 +542,7 @@ GEM
       domain_name (~> 0.5)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    i18n (1.8.11)
+    i18n (1.9.0)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.0)
       i18n (>= 0.6.6)
@@ -657,13 +657,13 @@ GEM
     pdf-core (0.9.0)
     pdf-inspector (1.3.0)
       pdf-reader (>= 1.0, < 3.0.a)
-    pdf-reader (2.8.0)
+    pdf-reader (2.9.0)
       Ascii85 (~> 1.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    pg (1.2.3)
+    pg (1.3.0)
     plaintext (0.3.4)
       activesupport (> 2.2.1)
       nokogiri (~> 1.10, >= 1.10.4)
@@ -811,7 +811,7 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (5.0.2)
+    rspec-rails (5.1.0)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -1068,7 +1068,7 @@ DEPENDENCIES
   openproject-xls_export!
   overviews!
   parallel_tests (~> 3.1)
-  pg (~> 1.2.2)
+  pg (~> 1.3.0)
   plaintext (~> 0.3.2)
   posix-spawn (~> 0.3.13)
   prawn (~> 2.2)
@@ -1099,7 +1099,7 @@ DEPENDENCIES
   roar (~> 1.1.0)
   rouge (~> 3.27.0)
   rspec (~> 3.10.0)
-  rspec-rails (~> 5.0.0)
+  rspec-rails (~> 5.1.0)
   rspec-retry (~> 0.6.1)
   rubocop
   rubocop-rails

diff --git a/lib/open_project/patches/i18n_reject_empty_string.rb b/lib/open_project/patches/i18n_reject_empty_string.rb
@@ -43,7 +43,7 @@ module Patches
     # https://community.openproject.com/wp/36304
     module I18nRejectEmptyString
       def load_yml(filename)
-        replace_empty_strings super
+        replace_empty_strings(super.first)
       end
 
       def replace_empty_strings(hash)
@@ -59,6 +59,6 @@ def replace_empty_strings(hash)
   end
 end
 
-OpenProject::Patches.patch_gem_version 'i18n', '1.8.11' do
+OpenProject::Patches.patch_gem_version 'i18n', '1.9.0' do
   I18n.backend.singleton_class.prepend OpenProject::Patches::I18nRejectEmptyString
 end