X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f1c6a87aa137c11d0aff5a4b0e563ac2c2a8f82d..1586e2ba802e051f122d42fd8ad30aa3e6fdbf18:/Gemfile diff --git a/Gemfile b/Gemfile index 8ccc5026b..466d73323 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "6.0.1" +gem "rails", "6.0.2" # Require things which have moved to gems in ruby 1.9 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19 @@ -34,14 +34,16 @@ gem "bootsnap", ">= 1.4.2", :require => false gem "r2", "~> 0.2.7" # Use autoprefixer to generate CSS prefixes -gem "autoprefixer-rails", "~> 8.6.3" +gem "autoprefixer-rails" # Use image_optim to optimise images gem "image_optim_rails" # Load rails plugins +gem "actionpack-page_caching", ">= 1.2.0" gem "active_record_union" gem "activerecord-import" +gem "bootstrap", "~> 4.3.1" gem "cancancan" gem "composite_primary_keys", "~> 12.0.0" gem "config" @@ -50,7 +52,6 @@ gem "dynamic_form" gem "http_accept_language", "~> 2.0.0" gem "i18n-js", ">= 3.0.0" gem "oauth-plugin", ">= 0.5.1" -gem "openstreetmap-actionpack-page_caching", ">= 1.1.2", :require => "actionpack/page_caching" gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry" gem "rack-cors" gem "rails-i18n", "~> 4.0.0"