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.7"
>>>>>>> c03f27e5 (chore(CE): Update Server Gem 0.34.7 (#1442))

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.7)
>>>>>>> c03f27e5 (chore(CE): Update Server Gem 0.34.7 (#1442))
MailchimpMarketing
activesupport
async-websocket
Expand Down Expand Up @@ -2336,7 +2340,11 @@ DEPENDENCIES
kaminari
letter_opener
liquid
<<<<<<< HEAD
multiwoven-integrations (~> 0.34.5)
=======
multiwoven-integrations (~> 0.34.7)
>>>>>>> c03f27e5 (chore(CE): Update Server Gem 0.34.7 (#1442))
mysql2
newrelic_rpm
parallel
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
class ChangeExistAwsBedrockSubCategory < ActiveRecord::Migration[7.1]
def up
Connector.where(connector_name: "AwsBedrockModel", connector_sub_category: "AI_ML Service").update_all(connector_sub_category: "LLM")
end

def down
Connector.where(connector_name: "AwsBedrockModel", connector_sub_category: "LLM").update_all(connector_sub_category: "AI_ML Service")
end
end
4 changes: 4 additions & 0 deletions server/db/data_schema.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<<<<<<< HEAD
# frozen_string_literal: true

DataMigrate::Data.define(version: 20250724110926)
=======
DataMigrate::Data.define(version: 20251107142417)
>>>>>>> c03f27e5 (chore(CE): Update Server Gem 0.34.7 (#1442))
Loading