X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c8054024fc151c33fab4c34dd43623f4ced9f5e4..36179746309d7659d3e20512c34bc2742b094a04:/Gemfile?ds=inline

diff --git a/Gemfile b/Gemfile
index 10e34638e..75cb1054b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "6.1.3.2"
+gem "rails", "6.1.4.1"
 
 # Require json for multi_json
 gem "json"
@@ -12,8 +12,8 @@ gem "pg"
 # 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"
@@ -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"
 
@@ -141,7 +145,7 @@ group :test do
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"
-  gem "rubocop-rails"
+  gem "rubocop-rails", "~> 2.11.3" # Bug in 2.12.0, fixed in master after 2.12.2
   gem "rubocop-rake"
   gem "selenium-webdriver"
   gem "simplecov", :require => false