X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/41f95466faf0cdf3aed3be70f88f0a23d17b420e..31f454e0f7323422c0e537e943326e2a49bd168a:/Gemfile diff --git a/Gemfile b/Gemfile index 7e9be257b..fd1df513c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "6.0.3.6" +gem "rails", "6.1.3.2" # Require json for multi_json gem "json" @@ -40,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" @@ -118,14 +117,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", "< 1.0.0" + gem "debug_inspector" gem "listen" gem "vendorer" end @@ -143,6 +142,7 @@ group :test do gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rails" + gem "rubocop-rake" gem "selenium-webdriver" gem "simplecov", :require => false gem "simplecov-lcov", :require => false