X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e1065adc610f3094a22d43dddad5ffa04338ec38..0100cfe304954c42305b58e7857fb9de81808267:/Gemfile diff --git a/Gemfile b/Gemfile index 6b1049ec7..7ee75cb66 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "6.1.4.1" +gem "rails", "6.1.4.4" # Require json for multi_json gem "json" @@ -33,6 +33,9 @@ gem "autoprefixer-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" @@ -40,7 +43,7 @@ gem "active_record_union" gem "bootstrap", "~> 4.5.0" gem "bootstrap_form", "~> 4.0" gem "cancancan" -gem "composite_primary_keys", "~> 13.0.0" +gem "composite_primary_keys", "~> 13.0.0", "!= 13.0.1" gem "config" gem "delayed_job_active_record" gem "http_accept_language", "~> 2.1.1" @@ -96,6 +99,7 @@ gem "maxminddb" gem "rotp" # Load memcache client in case we are using it +gem "connection_pool" gem "dalli" gem "kgio" @@ -147,7 +151,7 @@ group :test do gem "rubocop-performance" gem "rubocop-rails" gem "rubocop-rake" - gem "selenium-webdriver" + gem "selenium-webdriver", "~> 3.142.7" gem "simplecov", :require => false gem "simplecov-lcov", :require => false gem "webmock"