X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0e78061cdba5cfb3f299f57b7643d2b396ee235b..819ad523b534c30c80548828f3b07938d37aa772:/Gemfile

diff --git a/Gemfile b/Gemfile
index a5b7d401f..42385a307 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.4"
 
 # Require json for multi_json
 gem "json"
@@ -40,7 +40,7 @@ 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 "http_accept_language", "~> 2.1.1"
@@ -69,6 +69,10 @@ 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"
 
@@ -117,7 +121,7 @@ gem "browser"
 gem "aws-sdk-s3"
 
 # Used to resize user images
-gem "mini_magick"
+gem "image_processing"
 
 # Gems useful for development
 group :development do
@@ -136,12 +140,13 @@ group :test do
   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 "rubocop-rake"
   gem "selenium-webdriver"
   gem "simplecov", :require => false
   gem "simplecov-lcov", :require => false