Merge pull request #3440 from mmd-osm/relationmemberlimit

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index a5b7d401f480574b8e30ecf48297e96fa76c5907..21dbbf421fc26c7c8e99baf6b311f58c1b78403b 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "6.0.3.6"
+gem "rails", "6.1.4.6"

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


@@ -12,8 +12,8 @@ gem "pg"
 # Use SCSS for stylesheets
 gem "sassc-rails"
 
 # 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"
 
 # Use jquery as the JavaScript library
 gem "jquery-rails"


@@ -33,6 +33,9 @@ gem "autoprefixer-rails"
 # Use image_optim to optimise images
 gem "image_optim_rails"
 
 # Use image_optim to optimise images
 gem "image_optim_rails"
 

+# Use argon2 for password hashing
+gem "argon2"
+

 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
 # Load rails plugins
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"


@@ -40,7 +43,7 @@ gem "active_record_union"
 gem "bootstrap", "~> 4.5.0"
 gem "bootstrap_form", "~> 4.0"
 gem "cancancan"
 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 "http_accept_language", "~> 2.1.1"
 gem "config"
 gem "delayed_job_active_record"
 gem "http_accept_language", "~> 2.1.1"


@@ -69,6 +72,10 @@ gem "omniauth-openid"
 gem "omniauth-rails_csrf_protection", "~> 1.0"
 gem "omniauth-windowslive"
 
 gem "omniauth-rails_csrf_protection", "~> 1.0"
 gem "omniauth-windowslive"
 

+# Doorkeeper for OAuth2
+gem "doorkeeper"
+gem "doorkeeper-i18n"
+

 # Markdown formatting support
 gem "kramdown"
 
 # Markdown formatting support
 gem "kramdown"
 


@@ -92,6 +99,7 @@ gem "maxminddb"
 gem "rotp"
 
 # Load memcache client in case we are using it
 gem "rotp"
 
 # Load memcache client in case we are using it

+gem "connection_pool"

 gem "dalli"
 gem "kgio"
 
 gem "dalli"
 gem "kgio"
 


@@ -117,7 +125,7 @@ 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
 
 # Gems useful for development
 group :development do


@@ -136,13 +144,14 @@ group :test do
   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", "~> 5.0"
+  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 "selenium-webdriver"
+  gem "rubocop-rake"
+  gem "selenium-webdriver", "~> 3.142.7"

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