X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7e5cbe87ed37f9cba8224fa4049047d7f981f66a..520cffabeafdc616c2e1284734dab9afafccb453:/Gemfile diff --git a/Gemfile b/Gemfile index 7bad308b4..ebbebe4f9 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "7.0.4" +gem "rails", "~> 7.0.0" # Require json for multi_json gem "json" @@ -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.64.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_2_3" gem "bootstrap_form", "~> 5.0" gem "cancancan" gem "composite_primary_keys", "~> 14.0.0" @@ -72,12 +74,12 @@ 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", "~> 5.5.4" +gem "doorkeeper" gem "doorkeeper-i18n" # Markdown formatting support @@ -137,6 +139,7 @@ group :development do gem "better_errors" gem "binding_of_caller" gem "debug_inspector" + gem "i18n-tasks" gem "listen" gem "vendorer" end @@ -151,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"