X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/86428201ddda4963855f01e768fb1e1813a7c86a..bab39572a17146d5b6e696f0ba584a89daac10c7:/Gemfile diff --git a/Gemfile b/Gemfile index 540f61634..10cfb970e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "6.0.3.2" +gem "rails", "6.0.3.4" # Require things which have moved to gems in ruby 1.9 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19 @@ -41,9 +41,10 @@ gem "image_optim_rails" # Load rails plugins gem "actionpack-page_caching", ">= 1.2.0" -gem "active_record_union" gem "activerecord-import" +gem "active_record_union" gem "bootstrap", "~> 4.5.0" +gem "bootstrap_form", "~> 4.0" gem "cancancan" gem "composite_primary_keys", "~> 12.0.0" gem "config" @@ -144,9 +145,9 @@ group :test do gem "erb_lint", :require => false gem "factory_bot_rails" gem "minitest", "~> 5.1" - gem "puma", "~> 4.3" + gem "puma", "~> 5.0" gem "rails-controller-testing" - gem "rubocop" + gem "rubocop", "~> 0.93" gem "rubocop-minitest" gem "rubocop-performance" gem "rubocop-rails"