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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 5a21c7f7ad4ae3a0f1fe79fe716b2a348996ec38..277346b8388df908c3e110cff5b9bbb55a18cf84 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.1.0"
+gem "rails", "~> 7.2.0"

 gem "turbo-rails"
 
 # Require json for multi_json
 gem "turbo-rails"
 
 # Require json for multi_json


@@ -59,13 +59,12 @@ gem "dry-validation"
 gem "frozen_record"
 gem "http_accept_language", "~> 2.1.1"
 gem "i18n-js", "~> 3.9.2"
 gem "frozen_record"
 gem "http_accept_language", "~> 2.1.1"
 gem "i18n-js", "~> 3.9.2"

-gem "oauth-plugin", ">= 0.5.1"

 gem "openstreetmap-deadlock_retry", ">= 1.3.1", :require => "deadlock_retry"
 gem "rack-cors"
 gem "rails-i18n", "~> 7.0.0"
 gem "rails_param"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
 gem "openstreetmap-deadlock_retry", ">= 1.3.1", :require => "deadlock_retry"
 gem "rack-cors"
 gem "rails-i18n", "~> 7.0.0"
 gem "rails_param"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"

-gem "strong_migrations"
+gem "strong_migrations", "< 2.0.0"

 gem "validates_email_format_of", ">= 1.5.1"
 
 # Native OSM extensions
 gem "validates_email_format_of", ">= 1.5.1"
 
 # Native OSM extensions


@@ -76,6 +75,7 @@ gem "addressable", "~> 2.8"
 gem "rack-uri_sanitizer"
 
 # Omniauth for authentication
 gem "rack-uri_sanitizer"
 
 # Omniauth for authentication

+gem "multi_json"

 gem "omniauth", "~> 2.0.2"
 gem "omniauth-facebook"
 gem "omniauth-github"
 gem "omniauth", "~> 2.0.2"
 gem "omniauth-facebook"
 gem "omniauth-github"


@@ -130,7 +130,7 @@ gem "gd2-ffij", ">= 0.4.0"
 gem "marcel"
 
 # Used for browser detection
 gem "marcel"
 
 # Used for browser detection

-gem "browser", "< 6" # for ruby 3.0 support
+gem "browser", "< 6" # for ruby 3.1 support

 
 # Used for S3 object storage
 gem "aws-sdk-s3"
 
 # Used for S3 object storage
 gem "aws-sdk-s3"


@@ -141,16 +141,19 @@ gem "image_processing"
 # Used to validate widths
 gem "unicode-display_width"
 
 # Used to validate widths
 gem "unicode-display_width"
 

-# Keep ruby 3.0 compatibility
-gem "multi_xml", "~> 0.6.0"
+# Lock some modules to old versions for ruby 3.1 support
+gem "zeitwerk", "< 2.7"

 
 # Gems useful for development
 group :development do
   gem "better_errors"
   gem "binding_of_caller"
 
 # Gems useful for development
 group :development do
   gem "better_errors"
   gem "binding_of_caller"

+  gem "danger"
+  gem "danger-auto_label"

   gem "debug_inspector"
   gem "i18n-tasks"
   gem "listen"
   gem "debug_inspector"
   gem "i18n-tasks"
   gem "listen"

+  gem "overcommit"

   gem "vendorer"
 end
 
   gem "vendorer"
 end
 


@@ -180,4 +183,9 @@ end
 
 group :development, :test do
   gem "annotate"
 
 group :development, :test do
   gem "annotate"

+  gem "teaspoon"
+  gem "teaspoon-mocha", "~> 2.3.3"
+
+  # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
+  gem "debug", :require => "debug/prelude"

 end
 end