Merge remote-tracking branch 'upstream/pull/3891'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 1b2b60864e080919086a01f3a4cd0fadd760f067..f5d0f7f4ff562f0570210ac6f3db6710742cda13 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "7.0.3.1"
+gem "rails", "~> 7.0.0"

 
 # Require json for multi_json
 gem "json"
 
 # Require json for multi_json
 gem "json"


@@ -49,6 +49,7 @@ gem "cancancan"
 gem "composite_primary_keys", "~> 14.0.0"
 gem "config"
 gem "delayed_job_active_record"
 gem "composite_primary_keys", "~> 14.0.0"
 gem "config"
 gem "delayed_job_active_record"

+gem "frozen_record"

 gem "http_accept_language", "~> 2.1.1"
 gem "i18n-js", "~> 3.9.2"
 gem "oauth-plugin", ">= 0.5.1"
 gem "http_accept_language", "~> 2.1.1"
 gem "i18n-js", "~> 3.9.2"
 gem "oauth-plugin", ">= 0.5.1"


@@ -130,6 +131,9 @@ gem "aws-sdk-s3"
 # Used to resize user images
 gem "image_processing"
 
 # Used to resize user images
 gem "image_processing"
 

+# Avoid mail 2.8.0 due to https://github.com/mikel/mail/issues/1489
+gem "mail", "~> 2.7.1"
+

 # Gems useful for development
 group :development do
   gem "annotate"
 # Gems useful for development
 group :development do
   gem "annotate"