X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b45635dbdc722554463b9e26d7e1473679c3f26a..9d717d45417f1cdb971da6f3dd2e9f2ba66ddcfd:/Gemfile?ds=sidebyside diff --git a/Gemfile b/Gemfile index a0dce8dbc..8dd0576d1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "7.0.2.3" +gem "rails", "~> 7.1.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" @@ -24,8 +26,8 @@ gem "jbuilder", "~> 2.7" # Reduces boot times through caching; required in config/boot.rb gem "bootsnap", ">= 1.4.2", :require => false -# Use R2 for RTL conversion -gem "r2", "~> 0.2.7" +# Use rtlcss for RTL conversion +gem "rtlcss" # Use autoprefixer to generate CSS prefixes gem "autoprefixer-rails" @@ -36,18 +38,24 @@ gem "image_optim_rails" # Use argon2 for password hashing gem "argon2" +# Support brotli compression for assets +gem "sprockets-exporters_pack" + +# Restore File.exists? for oauth gem +gem "file_exists" + # Load rails plugins gem "actionpack-page_caching", ">= 1.2.0" gem "activerecord-import" gem "active_record_union" -gem "bootstrap", "~> 4.5.0" -gem "bootstrap_form", "~> 4.0" +gem "bootstrap", "~> 5.3.2" +gem "bootstrap_form", "~> 5.0" gem "cancancan" -gem "composite_primary_keys", "~> 14.0.0" gem "config" gem "delayed_job_active_record" +gem "frozen_record" gem "http_accept_language", "~> 2.1.1" -gem "i18n-js", ">= 3.0.0" +gem "i18n-js", "~> 3.9.2" gem "oauth-plugin", ">= 0.5.1" gem "openstreetmap-deadlock_retry", ">= 1.3.1", :require => "deadlock_retry" gem "rack-cors" @@ -68,13 +76,14 @@ 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" gem "doorkeeper-i18n" +gem "doorkeeper-openid_connect" # Markdown formatting support gem "kramdown" @@ -129,10 +138,10 @@ gem "image_processing" # 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 @@ -143,10 +152,13 @@ group :test do gem "capybara", ">= 2.15" gem "erb_lint", :require => false gem "factory_bot_rails" + gem "jwt" gem "minitest", "~> 5.1" 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" @@ -156,3 +168,7 @@ group :test do gem "simplecov-lcov", :require => false gem "webmock" end + +group :development, :test do + gem "annotate" +end