X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bd93eafdcb14f89f21691c8b7095383f60a61cf7..41f13ac73a740b16bce708b23db8b2cdb6d24d1f:/Gemfile?ds=sidebyside

diff --git a/Gemfile b/Gemfile
index f5d0f7f4f..ea5fc3e9d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,9 @@ gem "json"
 gem "pg"
 
 # Use SCSS for stylesheets
-gem "sassc-rails"
+gem "dartsass-sprockets"
+# Pin the dependentent sass-embedded to avoid deprecation warnings in bootstrap
+gem "sass-embedded", "~> 1.55.0"
 
 # Use Terser as compressor for JavaScript assets
 gem "terser"
@@ -43,7 +45,7 @@ gem "sprockets-exporters_pack"
 gem "actionpack-page_caching", ">= 1.2.0"
 gem "activerecord-import"
 gem "active_record_union"
-gem "bootstrap", "~> 5.1.0"
+gem "bootstrap", :github => "gravitystorm/bootstrap-rubygem", :branch => "dartsass_5_1_3"
 gem "bootstrap_form", "~> 5.0"
 gem "cancancan"
 gem "composite_primary_keys", "~> 14.0.0"
@@ -72,9 +74,9 @@ gem "omniauth-facebook"
 gem "omniauth-github"
 gem "omniauth-google-oauth2", ">= 0.6.0"
 gem "omniauth-mediawiki", ">= 0.0.4"
+gem "omniauth-microsoft_graph"
 gem "omniauth-openid"
 gem "omniauth-rails_csrf_protection", "~> 1.0"
-gem "omniauth-windowslive"
 
 # Doorkeeper for OAuth2
 gem "doorkeeper"
@@ -131,15 +133,13 @@ gem "aws-sdk-s3"
 # Used to resize user images
 gem "image_processing"
 
-# Avoid mail 2.8.0 due to https://github.com/mikel/mail/issues/1489
-gem "mail", "~> 2.7.1"
-
 # Gems useful for development
 group :development do
   gem "annotate"
   gem "better_errors"
   gem "binding_of_caller"
   gem "debug_inspector"
+  gem "i18n-tasks"
   gem "listen"
   gem "vendorer"
 end
@@ -154,6 +154,8 @@ group :test do
   gem "puma", "~> 5.6"
   gem "rails-controller-testing"
   gem "rubocop"
+  gem "rubocop-capybara"
+  gem "rubocop-factory_bot"
   gem "rubocop-minitest"
   gem "rubocop-performance"
   gem "rubocop-rails"