X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/32ffd66eb5cb888b47446ae5053ab57f8a1e83cf..b5679e16dbd338731c5205bd71c0f5c4f344e6ed:/Gemfile diff --git a/Gemfile b/Gemfile index ea5fc3e9d..f9f12d64e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "~> 7.0.0" +gem "rails", "~> 7.1.0" # Require json for multi_json gem "json" @@ -12,7 +12,7 @@ gem "pg" # Use SCSS for stylesheets gem "dartsass-sprockets" # Pin the dependentent sass-embedded to avoid deprecation warnings in bootstrap -gem "sass-embedded", "~> 1.55.0" +gem "sass-embedded", "~> 1.64.0" # Use Terser as compressor for JavaScript assets gem "terser" @@ -45,10 +45,9 @@ gem "sprockets-exporters_pack" gem "actionpack-page_caching", ">= 1.2.0" gem "activerecord-import" gem "active_record_union" -gem "bootstrap", :github => "gravitystorm/bootstrap-rubygem", :branch => "dartsass_5_1_3" +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" @@ -81,6 +80,7 @@ gem "omniauth-rails_csrf_protection", "~> 1.0" # Doorkeeper for OAuth2 gem "doorkeeper" gem "doorkeeper-i18n" +gem "doorkeeper-openid_connect" # Markdown formatting support gem "kramdown" @@ -135,7 +135,6 @@ gem "image_processing" # Gems useful for development group :development do - gem "annotate" gem "better_errors" gem "binding_of_caller" gem "debug_inspector" @@ -150,6 +149,7 @@ 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" @@ -165,3 +165,7 @@ group :test do gem "simplecov-lcov", :require => false gem "webmock" end + +group :development, :test do + gem "annotate" +end