Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/bump gems #12496

Merged
merged 8 commits into from
Apr 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ group :test do
end

group :ldap do
gem 'net-ldap', '~> 0.17.0'
gem 'net-ldap', '~> 0.18.0'
end

group :development do
Expand Down Expand Up @@ -326,7 +326,7 @@ gem 'disposable', '~> 0.6.2'

platforms :mri, :mingw, :x64_mingw do
group :postgres do
gem 'pg', '~> 1.4.0'
gem 'pg', '~> 1.5.0'
end

# Support application loading when no database exists yet.
Expand Down
24 changes: 12 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ GEM
awesome_nested_set (3.5.0)
activerecord (>= 4.0.0, < 7.1)
aws-eventstream (1.2.0)
aws-partitions (1.750.0)
aws-partitions (1.754.0)
aws-sdk-core (3.171.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
Expand Down Expand Up @@ -521,7 +521,7 @@ GEM
domain_name (~> 0.5)
http_parser.rb (0.6.0)
httpclient (2.8.3)
i18n (1.12.0)
i18n (1.13.0)
concurrent-ruby (~> 1.0)
i18n-js (3.9.2)
i18n (>= 0.6.6)
Expand Down Expand Up @@ -607,7 +607,7 @@ GEM
net-imap (0.3.4)
date
net-protocol
net-ldap (0.17.1)
net-ldap (0.18.0)
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
Expand Down Expand Up @@ -648,7 +648,7 @@ GEM
parallel (1.23.0)
parallel_tests (4.2.0)
parallel
parser (3.2.2.0)
parser (3.2.2.1)
ast (~> 2.4.1)
pdf-core (0.9.0)
pdf-inspector (1.3.0)
Expand All @@ -659,7 +659,7 @@ GEM
hashery (~> 2.0)
ruby-rc4
ttfunk
pg (1.4.6)
pg (1.5.2)
plaintext (0.3.4)
activesupport (> 2.2.1)
nokogiri (~> 1.10, >= 1.10.4)
Expand Down Expand Up @@ -702,7 +702,7 @@ GEM
puma (>= 5.0, < 7)
raabro (1.4.0)
racc (1.6.2)
rack (2.2.6.4)
rack (2.2.7)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (6.6.1)
Expand Down Expand Up @@ -764,7 +764,7 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rbtree3 (0.7.0)
rbtree3 (0.7.1)
rdoc (6.5.0)
psych (>= 4.0.0)
recaptcha (5.14.0)
Expand Down Expand Up @@ -797,9 +797,9 @@ GEM
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.1)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.5)
Expand Down Expand Up @@ -828,7 +828,7 @@ GEM
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.28.0)
parser (>= 3.2.1.0)
rubocop-capybara (2.17.1)
rubocop-capybara (2.18.0)
rubocop (~> 1.41)
rubocop-rails (2.19.1)
activesupport (>= 4.2.0)
Expand Down Expand Up @@ -1040,7 +1040,7 @@ DEPENDENCIES
mini_magick (~> 4.12.0)
multi_json (~> 1.15.0)
my_page!
net-ldap (~> 0.17.0)
net-ldap (~> 0.18.0)
nokogiri (~> 1.14.3)
oj (~> 3.14.0)
okcomputer (~> 1.18.1)
Expand Down Expand Up @@ -1074,7 +1074,7 @@ DEPENDENCIES
ox
paper_trail (~> 12.3)
parallel_tests (~> 4.0)
pg (~> 1.4.0)
pg (~> 1.5.0)
plaintext (~> 0.3.2)
posix-spawn (~> 0.3.13)
prawn (~> 2.2)
Expand Down
2 changes: 1 addition & 1 deletion lib/open_project/patches/i18n_reject_empty_string.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ def replace_empty_strings(hash)
end
end

OpenProject::Patches.patch_gem_version 'i18n', '1.12.0' do
OpenProject::Patches.patch_gem_version 'i18n', '1.13.0' do
I18n.backend.singleton_class.prepend OpenProject::Patches::I18nRejectEmptyString
end