]> git.openstreetmap.org Git - rails.git/blobdiff - Gemfile
Merge remote-tracking branch 'upstream/pull/3194'
[rails.git] / Gemfile
diff --git a/Gemfile b/Gemfile
index b80771a28a3c4a257a4d1b7d8256234079b6755a..9568ea5f8cb2849f96c2510733a62e6b2d028ddc 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "6.0.3.4"
+gem "rails", "6.0.3.7"
 
 # Require json for multi_json
 gem "json"
@@ -43,11 +43,10 @@ gem "cancancan"
 gem "composite_primary_keys", "~> 12.0.0"
 gem "config"
 gem "delayed_job_active_record"
-gem "dynamic_form"
 gem "http_accept_language", "~> 2.1.1"
 gem "i18n-js", ">= 3.0.0"
 gem "oauth-plugin", ">= 0.5.1"
-gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"
+gem "openstreetmap-deadlock_retry", ">= 1.3.1", :require => "deadlock_retry"
 gem "rack-cors"
 gem "rails-i18n", "~> 6.0.0"
 gem "rinku", ">= 2.0.6", :require => "rails_rinku"
@@ -109,7 +108,7 @@ gem "logstasher"
 gem "bzip2-ffi"
 gem "ffi-libarchive"
 gem "gd2-ffij", ">= 0.4.0"
-gem "mimemagic"
+gem "marcel"
 
 # Used for browser detection
 gem "browser"
@@ -125,7 +124,7 @@ group :development do
   gem "annotate"
   gem "better_errors"
   gem "binding_of_caller"
-  gem "debug_inspector", "< 1.0.0"
+  gem "debug_inspector"
   gem "listen"
   gem "vendorer"
 end