Use badges for the trace visibility labels

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index d7739491172f55d499e652c2bc6941bde9f62bf8..466d733235ab4b8d59e59837ad2f3e608199dd60 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 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
 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19


@@ -40,6 +40,7 @@ gem "autoprefixer-rails"
 gem "image_optim_rails"
 
 # Load rails plugins
 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 "active_record_union"
 gem "activerecord-import"
 gem "bootstrap", "~> 4.3.1"


@@ -51,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 "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"
 gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry"
 gem "rack-cors"
 gem "rails-i18n", "~> 4.0.0"