# HG changeset patch # User edogawaconan # Date 1396705786 -32400 # Node ID eac1893242bbb82df54347eed47e7383da3a9d1b # Parent 408c4a17e1a637090dcce8d02414dbce850e85dd Update gems. diff -r 408c4a17e1a6 -r eac1893242bb Gemfile.lock --- a/Gemfile.lock Wed Mar 12 19:58:51 2014 +0900 +++ b/Gemfile.lock Sat Apr 05 22:49:46 2014 +0900 @@ -1,34 +1,34 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.0.rc1) - actionpack (= 4.1.0.rc1) - actionview (= 4.1.0.rc1) + actionmailer (4.1.0.rc2) + actionpack (= 4.1.0.rc2) + actionview (= 4.1.0.rc2) mail (~> 2.5.4) - actionpack (4.1.0.rc1) - actionview (= 4.1.0.rc1) - activesupport (= 4.1.0.rc1) + actionpack (4.1.0.rc2) + actionview (= 4.1.0.rc2) + activesupport (= 4.1.0.rc2) rack (~> 1.5.2) rack-test (~> 0.6.2) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.1.0.rc1) - activesupport (= 4.1.0.rc1) + actionview (4.1.0.rc2) + activesupport (= 4.1.0.rc2) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.0.rc1) - activesupport (= 4.1.0.rc1) + activemodel (4.1.0.rc2) + activesupport (= 4.1.0.rc2) builder (~> 3.1) - activerecord (4.1.0.rc1) - activemodel (= 4.1.0.rc1) - activesupport (= 4.1.0.rc1) + activerecord (4.1.0.rc2) + activemodel (= 4.1.0.rc2) + activesupport (= 4.1.0.rc2) arel (~> 5.0.0) activerecord-jdbc-adapter (1.3.6) activerecord (>= 2.2) activerecord-jdbcpostgresql-adapter (1.3.6) activerecord-jdbc-adapter (~> 1.3.6) jdbc-postgres (>= 9.1) - activesupport (4.1.0.rc1) + activesupport (4.1.0.rc2) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -38,8 +38,6 @@ railties (>= 3.0) sass (>= 3.2) arel (5.0.0) - atomic (1.1.14) - atomic (1.1.14-java) bouncy-castle-java (1.5.0147) builder (3.2.2) erubis (2.7.0) @@ -48,7 +46,7 @@ hooves (0.7) unicorn (> 0) i18n (0.6.9) - jdbc-postgres (9.3.1100) + jdbc-postgres (9.3.1101) jquery-rails (3.1.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) @@ -61,43 +59,44 @@ mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) - minitest (5.2.3) - multi_json (1.8.4) - newrelic_rpm (3.7.2.195) + minitest (5.3.2) + multi_json (1.9.2) + newrelic_rpm (3.7.3.204) pg (0.17.1) polyglot (0.3.4) - puma (2.7.1) + puma (2.8.1) rack (>= 1.1, < 2.0) - puma (2.7.1-java) + puma (2.8.1-java) rack (>= 1.1, < 2.0) quiet_assets (1.0.2) railties (>= 3.1, < 5.0) rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.0.rc1) - actionmailer (= 4.1.0.rc1) - actionpack (= 4.1.0.rc1) - actionview (= 4.1.0.rc1) - activemodel (= 4.1.0.rc1) - activerecord (= 4.1.0.rc1) - activesupport (= 4.1.0.rc1) + rails (4.1.0.rc2) + actionmailer (= 4.1.0.rc2) + actionpack (= 4.1.0.rc2) + actionview (= 4.1.0.rc2) + activemodel (= 4.1.0.rc2) + activerecord (= 4.1.0.rc2) + activesupport (= 4.1.0.rc2) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.0.rc1) + railties (= 4.1.0.rc2) sprockets-rails (~> 2.0.0) - railties (4.1.0.rc1) - actionpack (= 4.1.0.rc1) - activesupport (= 4.1.0.rc1) + railties (4.1.0.rc2) + actionpack (= 4.1.0.rc2) + activesupport (= 4.1.0.rc2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) - rake (10.1.1) - sass (3.2.14) - sass-rails (4.0.1) + rake (10.2.2) + sass (3.2.18) + sass-rails (4.0.3) railties (>= 4.0.0, < 5.0) - sass (>= 3.1.10) - sprockets-rails (~> 2.0.0) - sprockets (2.10.1) + sass (~> 3.2.0) + sprockets (~> 2.8, <= 2.11.0) + sprockets-rails (~> 2.0) + sprockets (2.11.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -106,21 +105,19 @@ actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) - therubyrhino (2.0.2) + therubyrhino (2.0.3) therubyrhino_jar (>= 1.7.3) therubyrhino_jar (1.7.4) - thor (0.18.1) - thread_safe (0.1.3) - atomic - thread_safe (0.1.3-java) - atomic + thor (0.19.1) + thread_safe (0.3.2) + thread_safe (0.3.2-java) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) tzinfo (1.1.0) thread_safe (~> 0.1) - uglifier (2.4.0) + uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) unicorn (4.8.2)