Merge pull request #4758 from tomhughes/login-referer

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 6ef2ca2fca70be08668fea90b47a4e8e87c3c766..75387b5d5e3b5c8db060e427ca352e834c6b6014 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -28,8 +28,8 @@ 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 "rtlcss"

 gem "mini_racer", "~> 0.9.0"
 gem "mini_racer", "~> 0.9.0"

+gem "rtlcss"

 
 # Use autoprefixer to generate CSS prefixes
 gem "autoprefixer-rails"
 
 # Use autoprefixer to generate CSS prefixes
 gem "autoprefixer-rails"


@@ -63,6 +63,7 @@ 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 "strong_migrations"
 gem "validates_email_format_of", ">= 1.5.1"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
 gem "strong_migrations"
 gem "validates_email_format_of", ">= 1.5.1"


@@ -131,7 +132,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.0 support

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


@@ -142,6 +143,9 @@ 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"
+

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