]> git.openstreetmap.org Git - rails.git/blobdiff - Gemfile
Merge remote-tracking branch 'upstream/pull/3174'
[rails.git] / Gemfile
diff --git a/Gemfile b/Gemfile
index 40476a5b8e3aaa21bf2b9ec6a3a105d260764ba5..7e9be257b4969997204625b53ff787390dc008cc 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.6"
 
 # Require json for multi_json
 gem "json"
@@ -61,12 +61,13 @@ gem "quad_tile", "~> 1.0.1"
 gem "rack-uri_sanitizer"
 
 # Omniauth for authentication
-gem "omniauth"
+gem "omniauth", "~> 2.0.2"
 gem "omniauth-facebook"
 gem "omniauth-github"
 gem "omniauth-google-oauth2", ">= 0.6.0"
 gem "omniauth-mediawiki", ">= 0.0.4"
 gem "omniauth-openid"
+gem "omniauth-rails_csrf_protection", "~> 1.0"
 gem "omniauth-windowslive"
 
 # Markdown formatting support
@@ -108,7 +109,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"