Update bundle

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 34bb226b9907431d9a440df05e479a8d65b5dfe3..10e34638eb8d294706f9d7cf8ca543418ec28380 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,13 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "6.0.3.2"
-
-# 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.3.2"

 
 # Require json for multi_json
 gem "json"
 
 # Require json for multi_json
 gem "json"


@@ -41,20 +35,20 @@ gem "image_optim_rails"
 
 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
 
 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"

-gem "active_record_union"

 gem "activerecord-import"
 gem "activerecord-import"

-gem "bootstrap", "~> 4.3.1"
+gem "active_record_union"
+gem "bootstrap", "~> 4.5.0"
+gem "bootstrap_form", "~> 4.0"

 gem "cancancan"
 gem "cancancan"

-gem "composite_primary_keys", "~> 12.0.0"
+gem "composite_primary_keys", "~> 13.0.0"

 gem "config"
 gem "delayed_job_active_record"
 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 "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 "rack-cors"

-gem "rails-i18n", "~> 4.0.0"
+gem "rails-i18n", "~> 6.0.0"

 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"


@@ -66,12 +60,13 @@ gem "quad_tile", "~> 1.0.1"
 gem "rack-uri_sanitizer"
 
 # Omniauth for authentication
 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-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
 gem "omniauth-windowslive"
 
 # Markdown formatting support


@@ -87,9 +82,6 @@ gem "libxml-ruby", ">= 2.0.5", :require => "libxml"
 gem "htmlentities"
 gem "sanitize"
 
 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"
 
 # Load faraday for mockable HTTP client
 gem "faraday"
 


@@ -116,7 +108,7 @@ gem "logstasher"
 gem "bzip2-ffi"
 gem "ffi-libarchive"
 gem "gd2-ffij", ">= 0.4.0"
 gem "bzip2-ffi"
 gem "ffi-libarchive"
 gem "gd2-ffij", ">= 0.4.0"

-gem "mimemagic"
+gem "marcel"

 
 # Used for browser detection
 gem "browser"
 
 # Used for browser detection
 gem "browser"


@@ -125,30 +117,34 @@ gem "browser"
 gem "aws-sdk-s3"
 
 # Used to resize user images
 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"
 
 # Gems useful for development
 group :development do
   gem "annotate"
   gem "better_errors"
   gem "binding_of_caller"

+  gem "debug_inspector"

   gem "listen"
   gem "vendorer"
 end
 
 # Gems needed for running tests
 group :test do
   gem "listen"
   gem "vendorer"
 end
 
 # Gems needed for running tests
 group :test do

+  gem "brakeman"

   gem "capybara", ">= 2.15"
   gem "capybara", ">= 2.15"

-  gem "coveralls", :require => false

   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"

-  gem "puma", "~> 3.11"
+  gem "puma", "~> 5.3"

   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"

+  gem "rubocop-rake"

   gem "selenium-webdriver"
   gem "selenium-webdriver"

+  gem "simplecov", :require => false
+  gem "simplecov-lcov", :require => false

   gem "webmock"
 end
   gem "webmock"
 end