Merge branch 'develop' into feat/add_lograge

# Conflicts: # Gemfile # Gemfile.lock
chatwoot · sojan-official · Apr 7, 2023 · Sep 12, 2022 · Sep 12, 2022 · Sep 14, 2022
commit 57fe05d34f3016e52c1325fed1fe5ff5673d242e
diff --git a/Gemfile b/Gemfile
@@ -149,7 +149,22 @@ gem 'net-imap', require: false
 gem 'net-pop', require: false
 gem 'net-smtp', require: false
 
-group :production, :staging do
+gem 'lograge', '~> 0.12.0'
+
+# worked with microsoft refresh token
+gem 'omniauth-oauth2'
+
+gem 'audited', '~> 5.2'
+
+# need for google auth
+gem 'omniauth'
+gem 'omniauth-google-oauth2'
+gem 'omniauth-rails_csrf_protection', '~> 1.0'
+
+### Gems required only in specific deployment environments ###
+##############################################################
+
+group :production do
   # we dont want request timing out in development while using byebug
   gem 'rack-timeout'
 end
@@ -205,6 +220,4 @@ group :development, :test do
   gem 'simplecov', '0.17.1', require: false
   gem 'spring'
   gem 'spring-watcher-listen'
-end
-
-gem 'lograge', '~> 0.12.0'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -421,7 +421,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.18.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.8.1)