Update rails to 4.2.5.2

diff --git a/Gemfile b/Gemfile
index 6ae69eb0290eea18c80292772a5ecf1fe32f6fd4..41c85fd703c3ba3087be10e46a52afe16b08b54e 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "4.2.5.1"
+gem "rails", "4.2.5.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

diff --git a/Gemfile.lock b/Gemfile.lock
index 296131dc1b201fb31868fb05718b4322fc7ab061..7fb23a9c5c1cbfed2194e0423071983c3201f731 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,38 +2,38 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    actionmailer (4.2.5.1)
-      actionpack (= 4.2.5.1)
-      actionview (= 4.2.5.1)
-      activejob (= 4.2.5.1)
+    actionmailer (4.2.5.2)
+      actionpack (= 4.2.5.2)
+      actionview (= 4.2.5.2)
+      activejob (= 4.2.5.2)

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

-    actionpack (4.2.5.1)
-      actionview (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    actionpack (4.2.5.2)
+      actionview (= 4.2.5.2)
+      activesupport (= 4.2.5.2)

       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)

-    actionview (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    actionview (4.2.5.2)
+      activesupport (= 4.2.5.2)

       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)

-    activejob (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activejob (4.2.5.2)
+      activesupport (= 4.2.5.2)

       globalid (>= 0.3.0)
       globalid (>= 0.3.0)

-    activemodel (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activemodel (4.2.5.2)
+      activesupport (= 4.2.5.2)

       builder (~> 3.1)
       builder (~> 3.1)

-    activerecord (4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activerecord (4.2.5.2)
+      activemodel (= 4.2.5.2)
+      activesupport (= 4.2.5.2)

       arel (~> 6.0)
       arel (~> 6.0)

-    activesupport (4.2.5.1)
+    activesupport (4.2.5.2)

       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)


@@ -42,9 +42,8 @@ GEM
     addressable (2.4.0)
     arel (6.0.3)
     ast (2.2.0)
     addressable (2.4.0)
     arel (6.0.3)
     ast (2.2.0)

-    autoprefixer-rails (6.3.2)
+    autoprefixer-rails (6.3.3.1)

       execjs
       execjs

-      json

     bigdecimal (1.1.0)
     builder (3.2.2)
     capybara (2.6.2)
     bigdecimal (1.1.0)
     builder (3.2.2)
     capybara (2.6.2)


@@ -69,20 +68,17 @@ GEM
     colorize (0.7.7)
     composite_primary_keys (8.1.2)
       activerecord (~> 4.2.0)
     colorize (0.7.7)
     composite_primary_keys (8.1.2)
       activerecord (~> 4.2.0)

-    concurrent-ruby (1.0.0)
-    coveralls (0.8.10)
+    concurrent-ruby (1.0.1)
+    coveralls (0.8.12)

       json (~> 1.8)
       json (~> 1.8)

-      rest-client (>= 1.6.8, < 2)

       simplecov (~> 0.11.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (~> 1.6.0)
     crass (1.0.2)
       simplecov (~> 0.11.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (~> 1.6.0)
     crass (1.0.2)

-    dalli (2.7.5)
+    dalli (2.7.6)

     deadlock_retry (1.2.0)
     docile (1.1.5)
     deadlock_retry (1.2.0)
     docile (1.1.5)

-    domain_name (0.5.20160128)
-      unf (>= 0.0.5, < 1.0.0)

     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (2.6.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (2.6.0)


@@ -94,20 +90,18 @@ GEM
       activesupport (>= 4.1.0)
     hashie (3.4.3)
     htmlentities (4.3.4)
       activesupport (>= 4.1.0)
     hashie (3.4.3)
     htmlentities (4.3.4)

-    http-cookie (1.0.2)
-      domain_name (~> 0.5)

     http_accept_language (2.0.5)
     httpclient (2.7.1)
     i18n (0.7.0)
     i18n-js (3.0.0.rc12)
       i18n (~> 0.6, >= 0.6.6)
     http_accept_language (2.0.5)
     httpclient (2.7.1)
     i18n (0.7.0)
     i18n-js (3.0.0.rc12)
       i18n (~> 0.6, >= 0.6.6)

-    image_optim (0.22.0)
+    image_optim (0.22.1)

       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 2.1)
       image_size (~> 1.3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 2.1)
       image_size (~> 1.3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)

-    image_size (1.4.1)
+    image_size (1.4.2)

     in_threads (1.3.1)
     jquery-rails (4.1.0)
       rails-dom-testing (~> 1.0)
     in_threads (1.3.1)
     jquery-rails (4.1.0)
       rails-dom-testing (~> 1.0)


@@ -136,7 +130,7 @@ GEM
     libv8 (3.16.14.13)
     libxml-ruby (2.8.0)
     logstash-event (1.2.02)
     libv8 (3.16.14.13)
     libxml-ruby (2.8.0)
     logstash-event (1.2.02)

-    logstasher (0.8.6)
+    logstasher (0.9.0)

       activerecord (>= 3.0)
       activesupport (>= 3.0)
       logstash-event (~> 1.2.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       logstash-event (~> 1.2.0)


@@ -145,14 +139,13 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)

-    mime-types (2.99)
+    mime-types (2.99.1)

     mimemagic (0.3.0)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
     multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     mimemagic (0.3.0)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
     multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)

-    netrc (0.11.0)

     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     nokogumbo (1.4.7)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     nokogumbo (1.4.7)


@@ -194,7 +187,7 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)

-    parser (2.3.0.4)
+    parser (2.3.0.6)

       ast (~> 2.2)
     pg (0.18.4)
     poltergeist (1.9.0)
       ast (~> 2.2)
     pg (0.18.4)
     poltergeist (1.9.0)


@@ -214,16 +207,16 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     rack-uri_sanitizer (0.0.2)
     rack-test (0.6.3)
       rack (>= 1.0)
     rack-uri_sanitizer (0.0.2)

-    rails (4.2.5.1)
-      actionmailer (= 4.2.5.1)
-      actionpack (= 4.2.5.1)
-      actionview (= 4.2.5.1)
-      activejob (= 4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activerecord (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    rails (4.2.5.2)
+      actionmailer (= 4.2.5.2)
+      actionpack (= 4.2.5.2)
+      actionview (= 4.2.5.2)
+      activejob (= 4.2.5.2)
+      activemodel (= 4.2.5.2)
+      activerecord (= 4.2.5.2)
+      activesupport (= 4.2.5.2)

       bundler (>= 1.3.0, < 2.0)
       bundler (>= 1.3.0, < 2.0)

-      railties (= 4.2.5.1)
+      railties (= 4.2.5.2)

       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)


@@ -236,9 +229,9 @@ GEM
     rails-i18n (4.0.8)
       i18n (~> 0.7)
       railties (~> 4.0)
     rails-i18n (4.0.8)
       i18n (~> 0.7)
       railties (~> 4.0)

-    railties (4.2.5.1)
-      actionpack (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    railties (4.2.5.2)
+      actionpack (= 4.2.5.2)
+      activesupport (= 4.2.5.2)

       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)


@@ -246,12 +239,8 @@ GEM
     redcarpet (3.3.4)
     ref (2.0.0)
     request_store (1.3.0)
     redcarpet (3.3.4)
     ref (2.0.0)
     request_store (1.3.0)

-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)

     rinku (1.7.3)
     rinku (1.7.3)

-    rubocop (0.37.1)
+    rubocop (0.37.2)

       parser (>= 2.3.0.4, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       parser (>= 2.3.0.4, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)


@@ -279,7 +268,7 @@ GEM
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)

-    sprockets-rails (3.0.1)
+    sprockets-rails (3.0.3)

       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)


@@ -298,9 +287,6 @@ GEM
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)

-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.2)

     unicode-display_width (0.3.1)
     validates_email_format_of (1.6.3)
       i18n
     unicode-display_width (0.3.1)
     validates_email_format_of (1.6.3)
       i18n


@@ -353,7 +339,7 @@ DEPENDENCIES
   r2
   rack-cors
   rack-uri_sanitizer
   r2
   rack-cors
   rack-uri_sanitizer

-  rails (= 4.2.5.1)
+  rails (= 4.2.5.2)

   rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)
   rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)