Skip to content

Commit

Permalink
Merge pull request #15050 from opf/fix/bump_gems
Browse files Browse the repository at this point in the history
Fix/bump gems
  • Loading branch information
ulferts authored Mar 20, 2024
2 parents aee64b9 + b00173d commit acd9419
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ruby File.read(".ruby-version").strip

gem "actionpack-xml_parser", "~> 2.0.0"
gem "activemodel-serializers-xml", "~> 1.0.1"
gem "activerecord-import", "~> 1.5.0"
gem "activerecord-import", "~> 1.6.0"
gem "activerecord-session_store", "~> 2.1.0"
gem "ox"
gem "rails", "~> 7.1.3"
Expand Down Expand Up @@ -124,7 +124,7 @@ gem "multi_json", "~> 1.15.0"
gem "oj", "~> 3.16.0"

gem "daemons"
gem "good_job", "~> 3.26.1" # update should be done manually in sync with saas-openproject version.
gem "good_job", "= 3.26.2" # update should be done manually in sync with saas-openproject version.

gem "rack-protection", "~> 3.2.0"

Expand Down
22 changes: 11 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ GEM
activemodel (= 7.1.3.2)
activesupport (= 7.1.3.2)
timeout (>= 0.4.0)
activerecord-import (1.5.1)
activerecord-import (1.6.0)
activerecord (>= 4.2)
activerecord-nulldb-adapter (1.0.1)
activerecord (>= 5.2.0, < 7.2)
Expand Down Expand Up @@ -380,7 +380,7 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
base64 (0.2.0)
bcrypt (3.1.20)
better_html (2.0.2)
better_html (2.1.1)
actionview (>= 6.0)
activesupport (>= 6.0)
ast (~> 2.0)
Expand Down Expand Up @@ -514,7 +514,7 @@ GEM
erblint-github (1.0.1)
erubi (1.12.0)
escape_utils (1.3.0)
et-orbi (1.2.7)
et-orbi (1.2.9)
tzinfo
eventmachine (1.2.7)
eventmachine_httpserver (0.2.1)
Expand All @@ -538,7 +538,7 @@ GEM
websocket-driver (>= 0.6, < 0.8)
ffi (1.16.3)
flamegraph (0.9.5)
fog-aws (3.21.1)
fog-aws (3.22.0)
fog-core (~> 2.1)
fog-json (~> 1.1)
fog-xml (~> 0.1)
Expand Down Expand Up @@ -571,14 +571,14 @@ GEM
i18n (>= 0.7)
multi_json
request_store (>= 1.0)
good_job (3.26.1)
good_job (3.26.2)
activejob (>= 6.0.0)
activerecord (>= 6.0.0)
concurrent-ruby (>= 1.0.2)
fugit (>= 1.1)
railties (>= 6.0.0)
thor (>= 0.14.1)
google-apis-core (0.14.0)
google-apis-core (0.14.1)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 1.9)
httpclient (>= 2.8.1, < 3.a)
Expand Down Expand Up @@ -659,9 +659,9 @@ GEM
bindata
faraday (~> 2.0)
faraday-follow_redirects
json-schema (4.1.1)
json-schema (4.2.0)
addressable (>= 2.8)
json_schemer (2.2.0)
json_schemer (2.2.1)
base64
bigdecimal
hana (~> 1.3)
Expand Down Expand Up @@ -1032,7 +1032,7 @@ GEM
websocket (~> 1.0)
semantic (1.6.1)
shoulda-context (2.0.0)
shoulda-matchers (6.1.0)
shoulda-matchers (6.2.0)
activesupport (>= 5.2.0)
signet (0.19.0)
addressable (~> 2.8)
Expand Down Expand Up @@ -1160,7 +1160,7 @@ PLATFORMS
DEPENDENCIES
actionpack-xml_parser (~> 2.0.0)
activemodel-serializers-xml (~> 1.0.1)
activerecord-import (~> 1.5.0)
activerecord-import (~> 1.6.0)
activerecord-nulldb-adapter (~> 1.0.0)
activerecord-session_store (~> 2.1.0)
acts_as_list (~> 1.1.0)
Expand Down Expand Up @@ -1214,7 +1214,7 @@ DEPENDENCIES
friendly_id (~> 5.5.0)
fuubar (~> 2.5.0)
gon (~> 6.4.0)
good_job (~> 3.26.1)
good_job (= 3.26.2)
google-apis-gmail_v1
googleauth
grape (~> 2.0.0)
Expand Down

0 comments on commit acd9419

Please sign in to comment.