From ba1ef0873fd986a5fd8558a7a1753088c5f06945 Mon Sep 17 00:00:00 2001
From: Sojan <sojan@pepalo.com>
Date: Thu, 6 Mar 2025 18:33:11 -0800
Subject: [PATCH] chore: Change version

---
 Gemfile            |  8 ++++----
 Gemfile.lock       | 33 +++++----------------------------
 config/storage.yml |  2 +-
 3 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/Gemfile b/Gemfile
index dfe1c7d04..a4f570367 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,7 +30,9 @@ gem 'haikunator'
 # Template parsing safely
 gem 'liquid'
 # Parse Markdown to HTML
-gem 'commonmarker'
+# ref: https://github.com/gjtorikian/commonmarker/issues/358
+# can upgrade one this issue is fixed
+gem 'commonmarker', '2.0.4'
 # Validate Data against JSON Schema
 gem 'json_schemer'
 # Rack middleware for blocking & throttling abusive requests
@@ -46,9 +48,7 @@ gem 'csv-safe'
 
 ##-- for active storage --##
 gem 'aws-sdk-s3', require: false
-# original gem isn't maintained actively
-# we wanted updated version of faraday which is a dependency for slack-ruby-client
-gem 'azure-storage-blob', git: 'https://github.com/chatwoot/azure-storage-ruby', branch: 'chatwoot', require: false
+gem 'azure-blob', require: false
 gem 'google-cloud-storage', '>= 1.48.0', require: false
 gem 'image_processing'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 8e856e339..ae3880447 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,18 +1,3 @@
-GIT
-  remote: https://github.com/chatwoot/azure-storage-ruby
-  revision: 9957cf899d33a285b5dfe15bdb875292398e392b
-  branch: chatwoot
-  specs:
-    azure-storage-blob (2.0.3)
-      azure-storage-common (~> 2.0)
-      nokogiri (~> 1, >= 1.10.8)
-    azure-storage-common (2.0.4)
-      faraday (~> 2.0)
-      faraday-follow_redirects (~> 0.3.0)
-      faraday-net_http_persistent (~> 2.0)
-      net-http-persistent (~> 4.0)
-      nokogiri (~> 1, >= 1.10.8)
-
 GIT
   remote: https://github.com/chatwoot/devise-secure_password
   revision: adcc85fe1babfe40feae73dbcae64d14fff86e69
@@ -152,6 +137,8 @@ GEM
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
+    azure-blob (0.5.7)
+      rexml
     barnes (0.0.9)
       multi_json (~> 1)
       statsd-ruby (~> 1.1)
@@ -179,11 +166,8 @@ GEM
       logger (~> 1.5)
     climate_control (1.2.0)
     coderay (1.1.3)
-    commonmarker (2.1.0)
+    commonmarker (2.0.4)
       rb_sys (~> 0.9)
-    commonmarker (2.1.0-arm64-darwin)
-    commonmarker (2.1.0-x86_64-darwin)
-    commonmarker (2.1.0-x86_64-linux)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.0)
     crack (1.0.0)
@@ -263,8 +247,6 @@ GEM
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-follow_redirects (0.3.0)
-      faraday (>= 1, < 3)
     faraday-mashify (0.1.1)
       faraday (~> 2.0)
       hashie
@@ -272,9 +254,6 @@ GEM
       multipart-post (~> 2.0)
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    faraday-net_http_persistent (2.3.0)
-      faraday (~> 2.5)
-      net-http-persistent (>= 4.0.4, < 5)
     faraday-retry (2.2.1)
       faraday (~> 2.0)
     fcm (2.0.1)
@@ -549,8 +528,6 @@ GEM
       activerecord (>= 7)
     net-http (0.6.0)
       uri
-    net-http-persistent (4.0.5)
-      connection_pool (~> 2.2)
     net-imap (0.5.6)
       date
       net-protocol
@@ -957,7 +934,7 @@ DEPENDENCIES
   attr_extras
   audited (~> 5.4, >= 5.4.1)
   aws-sdk-s3
-  azure-storage-blob!
+  azure-blob
   barnes
   bootsnap
   brakeman
@@ -966,7 +943,7 @@ DEPENDENCIES
   bundle-audit
   byebug
   climate_control
-  commonmarker
+  commonmarker (= 2.0.4)
   csv-safe
   database_cleaner
   ddtrace
diff --git a/config/storage.yml b/config/storage.yml
index c01eb04d4..ccf00e382 100644
--- a/config/storage.yml
+++ b/config/storage.yml
@@ -23,7 +23,7 @@ google:
 
 # Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
 microsoft:
-  service: AzureStorage
+  service: AzureBlob
   storage_account_name: <%= ENV.fetch('AZURE_STORAGE_ACCOUNT_NAME', '') %>
   storage_access_key: <%= ENV.fetch('AZURE_STORAGE_ACCESS_KEY', '') %>
   container: <%= ENV.fetch('AZURE_STORAGE_CONTAINER', '') %>