Merge branch 'master' into feature/add-communities-page

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 1b2b60864e080919086a01f3a4cd0fadd760f067..7bad308b49bef847fa3c65b2e8a6bc17e1b2de1e 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.4"

 
 # 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"


@@ -76,7 +77,7 @@ gem "omniauth-rails_csrf_protection", "~> 1.0"
 gem "omniauth-windowslive"
 
 # Doorkeeper for OAuth2
 gem "omniauth-windowslive"
 
 # Doorkeeper for OAuth2

-gem "doorkeeper"
+gem "doorkeeper", "~> 5.5.4"

 gem "doorkeeper-i18n"
 
 # Markdown formatting support
 gem "doorkeeper-i18n"
 
 # Markdown formatting support