Skip to content

Commit

Permalink
Merge pull request #13577 from opf/fix/bump_gems
Browse files Browse the repository at this point in the history
Fix/bump gems
  • Loading branch information
ulferts authored Aug 28, 2023
2 parents 209da32 + cd09a9e commit 6858467
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 37 deletions.
14 changes: 7 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ruby '~> 3.2.1'
gem 'ox'
gem 'actionpack-xml_parser', '~> 2.0.0'
gem 'activemodel-serializers-xml', '~> 1.0.1'
gem 'activerecord-import', '~> 1.4.0'
gem 'activerecord-import', '~> 1.5.0'
gem 'activerecord-session_store', '~> 2.0.0'
gem 'rails', '~> 7.0', '>= 7.0.3.1'
gem 'responders', '~> 3.0'
Expand Down Expand Up @@ -103,7 +103,7 @@ gem 'svg-graph', '~> 2.2.0'

gem 'date_validator', '~> 0.12.0'
gem 'email_validator', '~> 2.2.3'
gem 'json_schemer', '~> 1.0.1'
gem 'json_schemer', '~> 2.0.0'
gem 'ruby-duration', '~> 3.2.0'

# `config/initializers/mail_starttls_patch.rb` has also been patched to
Expand All @@ -117,19 +117,19 @@ gem 'sys-filesystem', '~> 1.4.0', require: false
gem 'bcrypt', '~> 3.1.6'

gem 'multi_json', '~> 1.15.0'
gem 'oj', '~> 3.15.0'
gem 'oj', '~> 3.16.0'

gem 'daemons'
gem 'delayed_cron_job', '~> 0.9.0'
gem 'delayed_job_active_record', '~> 4.1.5'

gem 'rack-protection', '~> 3.0.0'
gem 'rack-protection', '~> 3.1.0'

# Rack::Attack is a rack middleware to protect your web app from bad clients.
# It allows whitelisting, blacklisting, throttling, and tracking based
# on arbitrary properties of the request.
# https://github.com/kickstarter/rack-attack
gem 'rack-attack', '~> 6.6.0'
gem 'rack-attack', '~> 6.7.0'

# CSP headers
gem 'secure_headers', '~> 6.5.0'
Expand All @@ -143,7 +143,7 @@ gem 'okcomputer', '~> 1.18.1'
gem 'gon', '~> 6.4.0'

# Lograge to provide sane and non-verbose logging
gem 'lograge', '~> 0.12.0'
gem 'lograge', '~> 0.13.0'

# Structured warnings to selectively disable them in production
gem 'structured_warnings', '~> 0.4.0'
Expand Down Expand Up @@ -255,7 +255,7 @@ group :test do
gem 'webmock', '~> 3.12', require: false

# Mock selenium requests through proxy (for feature tests)
gem 'puffing-billy', '~> 3.1.0'
gem 'puffing-billy', '~> 3.2.0'
gem 'table_print', '~> 1.5.6'

gem 'equivalent-xml', '~> 0.6'
Expand Down
56 changes: 28 additions & 28 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ PATH
remote: modules/calendar
specs:
openproject-calendar (1.0.0)
icalendar (~> 2.8.0)
icalendar (~> 2.9.0)

PATH
remote: modules/costs
Expand Down Expand Up @@ -139,7 +139,7 @@ PATH
remote: modules/meeting
specs:
openproject-meeting (1.0.0)
icalendar (~> 2.8.0)
icalendar (~> 2.9.0)

PATH
remote: modules/my_page
Expand Down Expand Up @@ -266,7 +266,7 @@ GEM
activerecord (7.0.7.2)
activemodel (= 7.0.7.2)
activesupport (= 7.0.7.2)
activerecord-import (1.4.1)
activerecord-import (1.5.0)
activerecord (>= 4.2)
activerecord-nulldb-adapter (0.9.0)
activerecord (>= 5.2.0, < 7.1)
Expand Down Expand Up @@ -309,7 +309,7 @@ GEM
awesome_nested_set (3.5.0)
activerecord (>= 4.0.0, < 7.1)
aws-eventstream (1.2.0)
aws-partitions (1.811.0)
aws-partitions (1.812.0)
aws-sdk-core (3.181.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
Expand Down Expand Up @@ -406,7 +406,7 @@ GEM
railties (>= 3.2)
dry-container (0.11.0)
concurrent-ruby (~> 1.0)
dry-core (1.0.0)
dry-core (1.0.1)
concurrent-ruby (~> 1.0)
zeitwerk (~> 2.6)
dry-inflector (1.0.0)
Expand Down Expand Up @@ -440,7 +440,7 @@ GEM
tzinfo
eventmachine (1.2.7)
eventmachine_httpserver (0.2.1)
excon (0.100.0)
excon (0.102.0)
factory_bot (6.2.1)
activesupport (>= 5.0.0)
factory_bot_rails (6.2.0)
Expand Down Expand Up @@ -493,7 +493,7 @@ GEM
i18n (>= 0.7)
multi_json
request_store (>= 1.0)
google-apis-core (0.11.0)
google-apis-core (0.11.1)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
Expand Down Expand Up @@ -539,7 +539,7 @@ GEM
i18n-js (4.2.3)
glob (>= 0.4.0)
i18n
icalendar (2.8.0)
icalendar (2.9.0)
ice_cube (~> 0.16)
ice_cube (0.16.4)
interception (0.5)
Expand All @@ -557,7 +557,7 @@ GEM
faraday-follow_redirects
json-schema (4.0.0)
addressable (>= 2.8)
json_schemer (1.0.3)
json_schemer (2.0.0)
hana (~> 1.3)
regexp_parser (~> 2.0)
simpleidn (~> 0.2)
Expand All @@ -580,7 +580,7 @@ GEM
omniauth (~> 1.1)
omniauth-openid-connect (>= 0.2.1)
rails (>= 3.2.21)
lograge (0.12.0)
lograge (0.13.0)
actionpack (>= 4)
activesupport (>= 4)
railties (>= 4)
Expand Down Expand Up @@ -612,14 +612,14 @@ GEM
meta-tags (2.18.0)
actionpack (>= 3.2.0, < 7.1)
method_source (1.0.0)
mime-types (3.4.1)
mime-types (3.5.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0218.1)
mime-types-data (3.2023.0808)
mini_magick (4.12.0)
mini_mime (1.1.5)
mini_portile2 (2.8.4)
minitest (5.19.0)
msgpack (1.7.1)
msgpack (1.7.2)
multi_json (1.15.0)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
Expand All @@ -639,7 +639,7 @@ GEM
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
oj (3.15.1)
oj (3.16.0)
okcomputer (1.18.4)
omniauth-saml (1.10.3)
omniauth (~> 1.3, >= 1.3.2)
Expand Down Expand Up @@ -714,7 +714,7 @@ GEM
psych (5.1.0)
stringio
public_suffix (5.0.3)
puffing-billy (3.1.0)
puffing-billy (3.2.0)
addressable (~> 2.5)
em-http-request (~> 1.1, >= 1.1.0)
em-synchrony
Expand All @@ -731,8 +731,8 @@ GEM
rack (2.2.8)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (6.6.1)
rack (>= 1.0, < 3)
rack-attack (6.7.0)
rack (>= 1.0, < 4)
rack-cors (2.0.1)
rack (>= 2.0.0)
rack-mini-profiler (3.1.1)
Expand All @@ -744,8 +744,8 @@ GEM
faraday-follow_redirects
json-jwt (>= 1.11.0)
rack (>= 2.1.0)
rack-protection (3.0.6)
rack
rack-protection (3.1.0)
rack (~> 2.2, >= 2.2.4)
rack-test (2.1.0)
rack (>= 1.3)
rack-timeout (0.6.3)
Expand Down Expand Up @@ -798,7 +798,7 @@ GEM
recaptcha (5.15.0)
redcarpet (3.6.0)
regexp_parser (2.8.1)
reline (0.3.6)
reline (0.3.8)
io-console (~> 0.5)
representable (3.2.0)
declarative (< 0.1.0)
Expand Down Expand Up @@ -918,7 +918,7 @@ GEM
store_attribute (1.1.1)
activerecord (>= 6.0)
stringex (2.8.6)
stringio (3.0.7)
stringio (3.0.8)
structured_warnings (0.4.0)
svg-graph (2.2.2)
swd (2.0.2)
Expand Down Expand Up @@ -992,7 +992,7 @@ PLATFORMS
DEPENDENCIES
actionpack-xml_parser (~> 2.0.0)
activemodel-serializers-xml (~> 1.0.1)
activerecord-import (~> 1.4.0)
activerecord-import (~> 1.5.0)
activerecord-nulldb-adapter (~> 0.9.0)
activerecord-session_store (~> 2.0.0)
acts_as_list (~> 1.1.0)
Expand Down Expand Up @@ -1051,14 +1051,14 @@ DEPENDENCIES
html-pipeline (~> 2.14.0)
htmldiff
i18n-js (~> 4.2.3)
json_schemer (~> 1.0.1)
json_schemer (~> 2.0.0)
json_spec (~> 1.1.4)
ladle
launchy (~> 2.5.0)
lefthook
letter_opener
listen (~> 3.8.0)
lograge (~> 0.12.0)
lograge (~> 0.13.0)
lookbook (~> 2.0.5)
mail (= 2.8.1)
matrix (~> 0.4.2)
Expand All @@ -1069,7 +1069,7 @@ DEPENDENCIES
my_page!
net-ldap (~> 0.18.0)
nokogiri (~> 1.15.1)
oj (~> 3.15.0)
oj (~> 3.16.0)
okcomputer (~> 1.18.1)
omniauth!
omniauth-openid-connect!
Expand Down Expand Up @@ -1110,13 +1110,13 @@ DEPENDENCIES
pry-byebug (~> 3.10.0)
pry-rails (~> 0.3.6)
pry-rescue (~> 1.5.2)
puffing-billy (~> 3.1.0)
puffing-billy (~> 3.2.0)
puma (~> 6.3)
puma-plugin-statsd (~> 2.0)
rack-attack (~> 6.6.0)
rack-attack (~> 6.7.0)
rack-cors (~> 2.0.0)
rack-mini-profiler
rack-protection (~> 3.0.0)
rack-protection (~> 3.1.0)
rack-test (~> 2.1.0)
rack-timeout (~> 0.6.3)
rack_session_access
Expand Down
2 changes: 1 addition & 1 deletion modules/calendar/openproject-calendar.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ Gem::Specification.new do |s|
s.license = 'GPLv3'

s.files = Dir['{app,config,db,lib}/**/*']
s.add_dependency 'icalendar', '~> 2.8.0'
s.add_dependency 'icalendar', '~> 2.9.0'
s.metadata['rubygems_mfa_required'] = 'true'
end
2 changes: 1 addition & 1 deletion modules/meeting/openproject-meeting.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ Gem::Specification.new do |s|

s.files = Dir['{app,config,db,lib,doc}/**/*', 'README.md']

s.add_dependency 'icalendar', '~> 2.8.0'
s.add_dependency 'icalendar', '~> 2.9.0'
s.metadata['rubygems_mfa_required'] = 'true'
end

0 comments on commit 6858467

Please sign in to comment.