# HG changeset patch # User edogawaconan # Date 1410768216 -32400 # Node ID cf5c379d133f542d29340ea405218cb08e71442e # Parent 03f904c070f72504193653fc8408357b09aaebb6 Update gems. diff -r 03f904c070f7 -r cf5c379d133f Gemfile.lock --- a/Gemfile.lock Sat Sep 06 00:46:25 2014 +0900 +++ b/Gemfile.lock Mon Sep 15 17:03:36 2014 +0900 @@ -1,27 +1,27 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.5) - actionpack (= 4.1.5) - actionview (= 4.1.5) - mail (~> 2.5.4) - actionpack (4.1.5) - actionview (= 4.1.5) - activesupport (= 4.1.5) + actionmailer (4.1.6) + actionpack (= 4.1.6) + actionview (= 4.1.6) + mail (~> 2.5, >= 2.5.4) + actionpack (4.1.6) + actionview (= 4.1.6) + activesupport (= 4.1.6) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.5) - activesupport (= 4.1.5) + actionview (4.1.6) + activesupport (= 4.1.6) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.5) - activesupport (= 4.1.5) + activemodel (4.1.6) + activesupport (= 4.1.6) builder (~> 3.1) - activerecord (4.1.5) - activemodel (= 4.1.5) - activesupport (= 4.1.5) + activerecord (4.1.6) + activemodel (= 4.1.6) + activesupport (= 4.1.6) arel (~> 5.0.0) - activesupport (4.1.5) + activesupport (4.1.6) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -45,49 +45,47 @@ json (1.8.1) json (1.8.1-java) kgio (2.9.2) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) + mail (2.6.1) + mime-types (>= 1.16, < 3) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) - mime-types (1.25.1) + mime-types (2.3) minitest (5.4.1) multi_json (1.10.1) multipart-post (2.0.0) naught (1.0.0) - polyglot (0.3.5) - puma (2.9.0) + puma (2.9.1) rack (>= 1.1, < 2.0) - puma (2.9.0-java) + puma (2.9.1-java) rack (>= 1.1, < 2.0) rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.5) - actionmailer (= 4.1.5) - actionpack (= 4.1.5) - actionview (= 4.1.5) - activemodel (= 4.1.5) - activerecord (= 4.1.5) - activesupport (= 4.1.5) + rails (4.1.6) + actionmailer (= 4.1.6) + actionpack (= 4.1.6) + actionview (= 4.1.6) + activemodel (= 4.1.6) + activerecord (= 4.1.6) + activesupport (= 4.1.6) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.5) + railties (= 4.1.6) sprockets-rails (~> 2.0) - railties (4.1.5) - actionpack (= 4.1.5) - activesupport (= 4.1.5) + railties (4.1.6) + actionpack (= 4.1.6) + activesupport (= 4.1.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) rake (10.3.2) - rdoc (4.1.1) + rdoc (4.1.2) json (~> 1.4) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) simple_oauth (0.2.0) spring (1.1.3) - sprockets (2.12.1) + sprockets (2.12.2) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -100,9 +98,6 @@ thread_safe (0.3.4) thread_safe (0.3.4-java) tilt (1.4.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) twitter (5.11.0) addressable (~> 2.3) buftok (~> 0.2.0) @@ -122,6 +117,7 @@ unf_ext unf (0.1.4-java) unf_ext (0.0.6) + unf_ext (0.0.6-x86-mingw32) unicorn (4.8.3) kgio (~> 2.6) rack