X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a89e86285f8aa6defe48de5235ae1224d1d40079..9266180344761718d4068dd62f78ef3a0169b8e1:/Gemfile diff --git a/Gemfile b/Gemfile index 5a21c7f7a..165236cdf 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "~> 7.1.0" +gem "rails", "~> 7.2.0" 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 "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 "strong_migrations" +gem "strong_migrations", "< 2.0.0" 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 "multi_json" 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 "browser", "< 6" # for ruby 3.0 support +gem "browser", "< 6" # for ruby 3.1 support # Used for S3 object storage gem "aws-sdk-s3" @@ -141,9 +141,6 @@ gem "image_processing" # Used to validate widths gem "unicode-display_width" -# Keep ruby 3.0 compatibility -gem "multi_xml", "~> 0.6.0" - # Gems useful for development group :development do gem "better_errors" @@ -151,6 +148,7 @@ group :development do gem "debug_inspector" gem "i18n-tasks" gem "listen" + gem "overcommit" gem "vendorer" end @@ -177,7 +175,3 @@ group :test do gem "simplecov-lcov", :require => false gem "webmock" end - -group :development, :test do - gem "annotate" -end