Update to iD v2.12.2

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 05bfc6cbd3e6d14ea36f335a468cf6767038de70..898e009c19fd28f42503700aeb78299bca61cbe8 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "5.2.0"
+gem "rails", "5.2.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


@@ -45,8 +45,9 @@ gem "image_optim_rails"
 
 # Load rails plugins
 gem "actionpack-page_caching"
 
 # Load rails plugins
 gem "actionpack-page_caching"

+gem "active_record_union"

 gem "cancancan"
 gem "cancancan"

-gem "composite_primary_keys", "~> 11.0.0"
+gem "composite_primary_keys", "~> 11.1.0"

 gem "delayed_job_active_record"
 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"
 gem "delayed_job_active_record"
 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"