Switch to canonical-rails from master, with rails 7.2.1+ compatibility

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 98b03518877a8ef6a8a157e66af9f3d9e9049cb0..26bc7c1291ba18699dfe492ce6005b1e1c7d6572 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,8 @@
 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 "json"
 
 # Require json for multi_json
 gem "json"


@@ -27,6 +28,7 @@ gem "jbuilder", "~> 2.7"
 gem "bootsnap", ">= 1.4.2", :require => false
 
 # Use rtlcss for RTL conversion
 gem "bootsnap", ">= 1.4.2", :require => false
 
 # Use rtlcss for RTL conversion

+gem "mini_racer", "~> 0.9.0"

 gem "rtlcss"
 
 # Use autoprefixer to generate CSS prefixes
 gem "rtlcss"
 
 # Use autoprefixer to generate CSS prefixes


@@ -41,6 +43,9 @@ gem "argon2"
 # Support brotli compression for assets
 gem "sprockets-exporters_pack"
 
 # Support brotli compression for assets
 gem "sprockets-exporters_pack"
 

+# Restore File.exists? for oauth gem
+gem "file_exists"
+

 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"


@@ -50,24 +55,27 @@ gem "bootstrap_form", "~> 5.0"
 gem "cancancan"
 gem "config"
 gem "delayed_job_active_record"
 gem "cancancan"
 gem "config"
 gem "delayed_job_active_record"

+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 "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 "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 "quad_tile", "~> 1.0.1"
 
 # Sanitise URIs
 gem "validates_email_format_of", ">= 1.5.1"
 
 # Native OSM extensions
 gem "quad_tile", "~> 1.0.1"
 
 # Sanitise URIs

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


@@ -109,11 +117,9 @@ gem "connection_pool"
 gem "dalli"
 gem "kgio"
 
 gem "dalli"
 gem "kgio"
 

-# Load secure_headers for Content-Security-Policy support
-gem "secure_headers"
-

 # Load canonical-rails to generate canonical URLs
 # Load canonical-rails to generate canonical URLs

-gem "canonical-rails"
+# Use unreleased version for rails 7.2.1+ compatibility
+gem "canonical-rails", :github => "jumph4x/canonical-rails", :ref => "fbc1c88c"

 
 # Used to generate logstash friendly log files
 gem "logstasher"
 
 # Used to generate logstash friendly log files
 gem "logstasher"


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

-gem "browser"
+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"


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

+# Used to validate widths
+gem "unicode-display_width"
+

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


@@ -140,6 +149,7 @@ group :development do
   gem "debug_inspector"
   gem "i18n-tasks"
   gem "listen"
   gem "debug_inspector"
   gem "i18n-tasks"
   gem "listen"

+  gem "overcommit"

   gem "vendorer"
 end
 
   gem "vendorer"
 end
 


@@ -151,6 +161,7 @@ group :test do
   gem "factory_bot_rails"
   gem "jwt"
   gem "minitest", "~> 5.1"
   gem "factory_bot_rails"
   gem "jwt"
   gem "minitest", "~> 5.1"

+  gem "minitest-focus", :require => false

   gem "puma", "~> 5.6"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "puma", "~> 5.6"
   gem "rails-controller-testing"
   gem "rubocop"


@@ -168,4 +179,7 @@ end
 
 group :development, :test do
   gem "annotate"
 
 group :development, :test do
   gem "annotate"

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

 end
 end