Merge remote-tracking branch 'upstream/pull/3356'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 10cfb970e4b5bf0207d16a7bba9079fa78076af2..17f6cc7918088f087c7e4121241785e1db2a0720 100644 (file)
--- 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.1.4.1"
 
 # Require json for multi_json
 gem "json"
@@ -18,8 +12,8 @@ gem "pg"
 # Use SCSS for stylesheets
 gem "sassc-rails"
 
-# Use Uglifier as compressor for JavaScript assets
-gem "uglifier", ">= 1.3.0"
+# Use Terser as compressor for JavaScript assets
+gem "terser"
 
 # Use jquery as the JavaScript library
 gem "jquery-rails"
@@ -46,14 +40,13 @@ gem "active_record_union"
 gem "bootstrap", "~> 4.5.0"
 gem "bootstrap_form", "~> 4.0"
 gem "cancancan"
-gem "composite_primary_keys", "~> 12.0.0"
+gem "composite_primary_keys", "~> 13.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"
@@ -67,14 +60,19 @@ 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"
 
+# Doorkeeper for OAuth2
+gem "doorkeeper"
+gem "doorkeeper-i18n"
+
 # Markdown formatting support
 gem "kramdown"
 
@@ -88,9 +86,6 @@ gem "libxml-ruby", ">= 2.0.5", :require => "libxml"
 gem "htmlentities"
 gem "sanitize"
 
-# Load SystemTimer for implementing request timeouts
-gem "SystemTimer", ">= 1.1.3", :require => "system_timer", :platforms => :ruby_18
-
 # Load faraday for mockable HTTP client
 gem "faraday"
 
@@ -101,6 +96,7 @@ gem "maxminddb"
 gem "rotp"
 
 # Load memcache client in case we are using it
+gem "connection_pool"
 gem "dalli"
 gem "kgio"
 
@@ -117,7 +113,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"
@@ -126,13 +122,14 @@ gem "browser"
 gem "aws-sdk-s3"
 
 # Used to resize user images
-gem "mini_magick"
+gem "image_processing"
 
 # Gems useful for development
 group :development do
   gem "annotate"
   gem "better_errors"
   gem "binding_of_caller"
+  gem "debug_inspector"
   gem "listen"
   gem "vendorer"
 end
@@ -141,16 +138,18 @@ end
 group :test do
   gem "brakeman"
   gem "capybara", ">= 2.15"
-  gem "coveralls", :require => false
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"
-  gem "puma", "~> 5.0"
+  gem "puma", "~> 5.3"
   gem "rails-controller-testing"
-  gem "rubocop", "~> 0.93"
+  gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"
-  gem "rubocop-rails"
-  gem "selenium-webdriver"
+  gem "rubocop-rails", "~> 2.11.3" # Bug in 2.12.0, fixed in master after 2.12.2
+  gem "rubocop-rake"
+  gem "selenium-webdriver", "~> 3.142.7"
+  gem "simplecov", :require => false
+  gem "simplecov-lcov", :require => false
   gem "webmock"
 end