Update to rails 5.1.6

diff --git a/Gemfile b/Gemfile
index 78e2aac976367e24382f51a0eac0c055d2f83d5b..4a403e251bd1f4179b565dacf963dc27b184e43f 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.1.5"
+gem "rails", "5.1.6"

 
 # 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


@@ -42,7 +42,7 @@ gem "image_optim_rails"
 
 # Load rails plugins
 gem "actionpack-page_caching"
 
 # Load rails plugins
 gem "actionpack-page_caching"

-gem "composite_primary_keys", "~> 10.0.0"
+gem "composite_primary_keys", "~> 10.0.4"

 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"
 gem "i18n-js", ">= 3.0.0"
 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"
 gem "i18n-js", ">= 3.0.0"

diff --git a/Gemfile.lock b/Gemfile.lock
index e0c1cba5e1b54ca1ecb7ce7fc1d226bfe5b1a470..6ee99f7c7acf9b39fb0973f6fd7fb2e8950a3bc6 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,43 +4,43 @@ GEM
     SystemTimer (1.2.3)
     aasm (4.12.3)
       concurrent-ruby (~> 1.0)
     SystemTimer (1.2.3)
     aasm (4.12.3)
       concurrent-ruby (~> 1.0)

-    actioncable (5.1.5)
-      actionpack (= 5.1.5)
+    actioncable (5.1.6)
+      actionpack (= 5.1.6)

       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)

-    actionmailer (5.1.5)
-      actionpack (= 5.1.5)
-      actionview (= 5.1.5)
-      activejob (= 5.1.5)
+    actionmailer (5.1.6)
+      actionpack (= 5.1.6)
+      actionview (= 5.1.6)
+      activejob (= 5.1.6)

       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)

-    actionpack (5.1.5)
-      actionview (= 5.1.5)
-      activesupport (= 5.1.5)
+    actionpack (5.1.6)
+      actionview (= 5.1.6)
+      activesupport (= 5.1.6)

       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-page_caching (1.1.0)
       actionpack (>= 4.0.0, < 6)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-page_caching (1.1.0)
       actionpack (>= 4.0.0, < 6)

-    actionview (5.1.5)
-      activesupport (= 5.1.5)
+    actionview (5.1.6)
+      activesupport (= 5.1.6)

       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)

-    activejob (5.1.5)
-      activesupport (= 5.1.5)
+    activejob (5.1.6)
+      activesupport (= 5.1.6)

       globalid (>= 0.3.6)
       globalid (>= 0.3.6)

-    activemodel (5.1.5)
-      activesupport (= 5.1.5)
-    activerecord (5.1.5)
-      activemodel (= 5.1.5)
-      activesupport (= 5.1.5)
+    activemodel (5.1.6)
+      activesupport (= 5.1.6)
+    activerecord (5.1.6)
+      activemodel (= 5.1.6)
+      activesupport (= 5.1.6)

       arel (~> 8.0)
       arel (~> 8.0)

-    activesupport (5.1.5)
+    activesupport (5.1.6)

       concurrent-ruby (~> 1.0, >= 1.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)

-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)

       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)


@@ -79,8 +79,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)

-    composite_primary_keys (10.0.3)
-      activerecord (~> 5.1.0, >= 5.1.5)
+    composite_primary_keys (10.0.4)
+      activerecord (~> 5.1.0, >= 5.1.6)

     concurrent-ruby (1.0.5)
     coveralls (0.8.21)
       json (>= 1.8, < 3)
     concurrent-ruby (1.0.5)
     coveralls (0.8.21)
       json (>= 1.8, < 3)


@@ -248,17 +248,17 @@ GEM
     rack-test (1.0.0)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)
     rack-test (1.0.0)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)

-    rails (5.1.5)
-      actioncable (= 5.1.5)
-      actionmailer (= 5.1.5)
-      actionpack (= 5.1.5)
-      actionview (= 5.1.5)
-      activejob (= 5.1.5)
-      activemodel (= 5.1.5)
-      activerecord (= 5.1.5)
-      activesupport (= 5.1.5)
+    rails (5.1.6)
+      actioncable (= 5.1.6)
+      actionmailer (= 5.1.6)
+      actionpack (= 5.1.6)
+      actionview (= 5.1.6)
+      activejob (= 5.1.6)
+      activemodel (= 5.1.6)
+      activerecord (= 5.1.6)
+      activesupport (= 5.1.6)

       bundler (>= 1.3.0)
       bundler (>= 1.3.0)

-      railties (= 5.1.5)
+      railties (= 5.1.6)

       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.2)
       actionpack (~> 5.x, >= 5.0.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.2)
       actionpack (~> 5.x, >= 5.0.1)


@@ -272,9 +272,9 @@ GEM
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)

-    railties (5.1.5)
-      actionpack (= 5.1.5)
-      activesupport (= 5.1.5)
+    railties (5.1.6)
+      actionpack (= 5.1.6)
+      activesupport (= 5.1.6)

       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)


@@ -375,7 +375,7 @@ DEPENDENCIES
   canonical-rails
   capybara (~> 2.13)
   coffee-rails (~> 4.2)
   canonical-rails
   capybara (~> 2.13)
   coffee-rails (~> 4.2)

-  composite_primary_keys (~> 10.0.0)
+  composite_primary_keys (~> 10.0.4)

   coveralls
   dalli
   dynamic_form
   coveralls
   dalli
   dynamic_form


@@ -413,7 +413,7 @@ DEPENDENCIES
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer

-  rails (= 5.1.5)
+  rails (= 5.1.6)

   rails-controller-testing
   rails-i18n (~> 4.0.0)
   record_tag_helper
   rails-controller-testing
   rails-i18n (~> 4.0.0)
   record_tag_helper