Update to rails 4.2.1

diff --git a/Gemfile b/Gemfile
index ae9c96b1c4ee7fc21368bcb8ef928de64d88df04..c423e66a06c2eb612f9259852d22ada1c27d6774 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.0"
+gem "rails", "4.2.1"

 
 # 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


@@ -43,7 +43,7 @@ gem "dynamic_form"
 gem "rinku", ">= 1.2.2", :require => "rails_rinku"
 gem "oauth-plugin", ">= 0.5.1"
 gem "validates_email_format_of", ">= 1.5.1"
 gem "rinku", ">= 1.2.2", :require => "rails_rinku"
 gem "oauth-plugin", ">= 0.5.1"
 gem "validates_email_format_of", ">= 1.5.1"

-gem "composite_primary_keys", "~> 8.0.0"
+gem "composite_primary_keys", "~> 8.1.0"

 gem "http_accept_language", "~> 2.0.0"
 gem "paperclip", "~> 4.0"
 gem "deadlock_retry", ">= 1.2.0"
 gem "http_accept_language", "~> 2.0.0"
 gem "paperclip", "~> 4.0"
 gem "deadlock_retry", ">= 1.2.0"

diff --git a/Gemfile.lock b/Gemfile.lock
index 7de1743dcef714eba8a6289d23d598c0ab799db7..f94bbb2c294fedb5360190d63273369fbd729362 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.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)

       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.0)
-      actionview (= 4.2.0)
-      activesupport (= 4.2.0)
-      rack (~> 1.6.0)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)

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

-    actionview (4.2.0)
-      activesupport (= 4.2.0)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)

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

-    activejob (4.2.0)
-      activesupport (= 4.2.0)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)

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

-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)

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

-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)

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

-    activesupport (4.2.0)
+    activesupport (4.2.1)

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


@@ -43,7 +43,7 @@ GEM
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)

-    autoprefixer-rails (5.1.7)
+    autoprefixer-rails (5.1.7.1)

       execjs
       json
     bigdecimal (1.1.0)
       execjs
       json
     bigdecimal (1.1.0)


@@ -57,7 +57,7 @@ GEM
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cliver (0.3.2)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cliver (0.3.2)

-    cocaine (0.5.5)
+    cocaine (0.5.7)

       climate_control (>= 0.0.3, < 1.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       climate_control (>= 0.0.3, < 1.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)


@@ -67,7 +67,7 @@ GEM
       execjs
     coffee-script-source (1.9.1)
     colorize (0.7.5)
       execjs
     coffee-script-source (1.9.1)
     colorize (0.7.5)

-    composite_primary_keys (8.0.0)
+    composite_primary_keys (8.1.0)

       activerecord (~> 4.2.0)
     coveralls (0.7.11)
       multi_json (~> 1.10)
       activerecord (~> 4.2.0)
     coveralls (0.7.11)
       multi_json (~> 1.10)


@@ -76,12 +76,12 @@ GEM
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
     crass (1.0.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
     crass (1.0.1)

-    dalli (2.7.2)
+    dalli (2.7.4)

     deadlock_retry (1.2.0)
     docile (1.1.5)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     deadlock_retry (1.2.0)
     docile (1.1.5)
     dynamic_form (1.1.4)
     erubis (2.7.0)

-    execjs (2.3.0)
+    execjs (2.4.0)

     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     globalid (0.3.3)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     globalid (0.3.3)


@@ -106,7 +106,7 @@ GEM
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)

-    jwt (1.3.0)
+    jwt (1.4.1)

     kgio (2.9.3)
     konacha (3.3.0)
       actionpack (>= 3.1, < 5)
     kgio (2.9.3)
     konacha (3.3.0)
       actionpack (>= 3.1, < 5)


@@ -123,7 +123,7 @@ GEM
     mime-types (2.4.3)
     mini_portile (0.6.2)
     minitest (5.5.1)
     mime-types (2.4.3)
     mini_portile (0.6.2)
     minitest (5.5.1)

-    multi_json (1.10.1)
+    multi_json (1.11.0)

     multi_xml (0.5.5)
     multipart-post (2.0.0)
     netrc (0.10.3)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     netrc (0.10.3)


@@ -174,31 +174,31 @@ GEM
       ruby-openid (>= 2.1.8)
     rack-test (0.6.3)
       rack (>= 1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.6.3)
       rack (>= 1.0)

-    rails (4.2.0)
-      actionmailer (= 4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
-      activemodel (= 4.2.0)
-      activerecord (= 4.2.0)
-      activesupport (= 4.2.0)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)

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

-      railties (= 4.2.0)
+      railties (= 4.2.1)

       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)

-    rails-dom-testing (1.0.5)
+    rails-dom-testing (1.0.6)

       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)

-    rails-html-sanitizer (1.0.1)
+    rails-html-sanitizer (1.0.2)

       loofah (~> 2.0)
     rails-i18n (4.0.4)
       i18n (~> 0.6)
       railties (~> 4.0)
       loofah (~> 2.0)
     rails-i18n (4.0.4)
       i18n (~> 0.6)
       railties (~> 4.0)

-    railties (4.2.0)
-      actionpack (= 4.2.0)
-      activesupport (= 4.2.0)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)

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


@@ -215,8 +215,8 @@ GEM
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)

-    ruby-openid (2.6.0)
-    ruby-progressbar (1.7.1)
+    ruby-openid (2.7.0)
+    ruby-progressbar (1.7.4)

     sanitize (3.1.2)
       crass (~> 1.0.1)
       nokogiri (>= 1.4.4)
     sanitize (3.1.2)
       crass (~> 1.0.1)
       nokogiri (>= 1.4.4)


@@ -249,10 +249,10 @@ GEM
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)

-    thread_safe (0.3.4)
+    thread_safe (0.3.5)

     tilt (1.4.1)
     timecop (0.7.3)
     tilt (1.4.1)
     timecop (0.7.3)

-    tins (1.3.4)
+    tins (1.3.5)

     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.7.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.7.1)


@@ -276,7 +276,7 @@ DEPENDENCIES
   autoprefixer-rails
   bigdecimal (~> 1.1.0)
   coffee-rails (~> 4.1.0)
   autoprefixer-rails
   bigdecimal (~> 1.1.0)
   coffee-rails (~> 4.1.0)

-  composite_primary_keys (~> 8.0.0)
+  composite_primary_keys (~> 8.1.0)

   coveralls
   dalli
   deadlock_retry (>= 1.2.0)
   coveralls
   dalli
   deadlock_retry (>= 1.2.0)


@@ -303,7 +303,7 @@ DEPENDENCIES
   psych
   r2
   rack-cors
   psych
   r2
   rack-cors

-  rails (= 4.2.0)
+  rails (= 4.2.1)

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