Skip to content
Open
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: 4 additions & 0 deletions server/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ gem "interactor", "~> 3.0"

gem "ruby-odbc", git: "https://github.com/Multiwoven/ruby-odbc.git"

<<<<<<< HEAD
gem "multiwoven-integrations", "~> 0.34.5"
=======
gem "multiwoven-integrations", "~> 0.34.11"
>>>>>>> 6c3a76f4 (chore(CE): upgrade integrations gem to 0.34.11 (#1481))

gem "temporal-ruby", github: "coinbase/temporal-ruby"

Expand Down
8 changes: 8 additions & 0 deletions server/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1979,7 +1979,11 @@ GEM
multi_xml (0.7.2)
bigdecimal (~> 3.1)
multipart-post (2.4.1)
<<<<<<< HEAD
multiwoven-integrations (0.34.5)
=======
multiwoven-integrations (0.34.11)
>>>>>>> 6c3a76f4 (chore(CE): upgrade integrations gem to 0.34.11 (#1481))
MailchimpMarketing
activesupport
async-websocket
Expand Down Expand Up @@ -2339,7 +2343,11 @@ DEPENDENCIES
kaminari
letter_opener
liquid
<<<<<<< HEAD
multiwoven-integrations (~> 0.34.5)
=======
multiwoven-integrations (~> 0.34.11)
>>>>>>> 6c3a76f4 (chore(CE): upgrade integrations gem to 0.34.11 (#1481))
mysql2
newrelic_rpm
parallel
Expand Down
Loading