X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8b840c650629d45e79f99811e9062aea5e130e33..40a942f5e549a815d9ab276c86ef1291023b162a:/Gemfile

diff --git a/Gemfile b/Gemfile
index 5385e1217..a7801fece 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "~> 7.1.0"
+gem "rails", "~> 8.0.0"
 gem "turbo-rails"
 
 # Require json for multi_json
@@ -14,6 +14,8 @@ gem "pg"
 gem "dartsass-sprockets"
 # Pin the dependentent sass-embedded to avoid deprecation warnings in bootstrap
 gem "sass-embedded", "~> 1.64.0"
+# Pin uri to avoid errors in dartsass-ruby
+gem "uri", "< 1.0.0"
 
 # Use Terser as compressor for JavaScript assets
 gem "terser"
@@ -49,7 +51,7 @@ gem "file_exists"
 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
-gem "active_record_union"
+gem "active_record_union", :github => "brianhempel/active_record_union", :ref => "master"
 gem "bootstrap", "~> 5.3.2"
 gem "bootstrap_form", "~> 5.0"
 gem "cancancan"
@@ -58,11 +60,11 @@ 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 "oauth-plugin", ">= 0.5.1"
+gem "i18n-js", "~> 4.2.3"
 gem "openstreetmap-deadlock_retry", ">= 1.3.1", :require => "deadlock_retry"
 gem "rack-cors"
-gem "rails-i18n", "~> 7.0.0"
+gem "rails-i18n", "~> 8.0.0"
+gem "rails_param"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
 gem "strong_migrations"
 gem "validates_email_format_of", ">= 1.5.1"
@@ -71,9 +73,11 @@ gem "validates_email_format_of", ">= 1.5.1"
 gem "quad_tile", "~> 1.0.1"
 
 # Sanitise URIs
+gem "addressable", "~> 2.8"
 gem "rack-uri_sanitizer"
 
 # Omniauth for authentication
+gem "multi_json"
 gem "omniauth", "~> 2.0.2"
 gem "omniauth-facebook"
 gem "omniauth-github"
@@ -115,9 +119,6 @@ gem "connection_pool"
 gem "dalli"
 gem "kgio"
 
-# Load secure_headers for Content-Security-Policy support
-gem "secure_headers"
-
 # Load canonical-rails to generate canonical URLs
 gem "canonical-rails"
 
@@ -130,9 +131,6 @@ gem "ffi-libarchive"
 gem "gd2-ffij", ">= 0.4.0"
 gem "marcel"
 
-# Used for browser detection
-gem "browser", "< 6" # for ruby 3.0 support
-
 # Used for S3 object storage
 gem "aws-sdk-s3"
 
@@ -146,9 +144,12 @@ gem "unicode-display_width"
 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 "overcommit"
   gem "vendorer"
 end
 
@@ -177,5 +178,10 @@ group :test do
 end
 
 group :development, :test do
-  gem "annotate"
+  gem "annotaterb"
+  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