X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1eb1335bb2b8f8a545c6a267d7cca81508197db8..de8ee536b1e6d511f6d943b2e9afabf778979e6b:/Gemfile

diff --git a/Gemfile b/Gemfile
index 264674fbc..7e9be257b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,13 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "6.0.3.4"
-
-# Require things which have moved to gems in ruby 1.9
-gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
-
-# Require things which have moved to gems in ruby 2.0
-gem "psych", :platforms => :ruby_20
+gem "rails", "6.0.3.6"
 
 # Require json for multi_json
 gem "json"
@@ -67,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
@@ -114,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"
@@ -130,6 +125,7 @@ group :development do
   gem "annotate"
   gem "better_errors"
   gem "binding_of_caller"
+  gem "debug_inspector", "< 1.0.0"
   gem "listen"
   gem "vendorer"
 end
@@ -143,7 +139,7 @@ group :test do
   gem "minitest", "~> 5.1"
   gem "puma", "~> 5.0"
   gem "rails-controller-testing"
-  gem "rubocop", "~> 0.93"
+  gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"