# HG changeset patch # User edogawaconan # Date 1397011242 -32400 # Node ID e5954c26d039c535a7339ff5f609bd65faa402d3 # Parent 9193eb99eaf06221ef242493718bc35085cf646a Update gems. diff -r 9193eb99eaf0 -r e5954c26d039 Gemfile --- a/Gemfile Mon Apr 07 15:56:58 2014 +0900 +++ b/Gemfile Wed Apr 09 11:40:42 2014 +0900 @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "rails", "~> 4.1.0.rc1" +gem "rails", "~> 4.1.0" gem "jquery-rails" # Bundle edge Rails instead: @@ -11,7 +11,7 @@ gem "jruby-openssl", :platforms => :jruby gem "dalli" -gem "sass-rails", "~> 4.0.0.rc1" +gem "sass-rails" gem "uglifier" gem "anjlab-bootstrap-rails", :require => "bootstrap-rails" diff -r 9193eb99eaf0 -r e5954c26d039 Gemfile.lock --- a/Gemfile.lock Mon Apr 07 15:56:58 2014 +0900 +++ b/Gemfile.lock Wed Apr 09 11:40:42 2014 +0900 @@ -1,32 +1,32 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.0.rc2) - actionpack (= 4.1.0.rc2) - actionview (= 4.1.0.rc2) + actionmailer (4.1.0) + actionpack (= 4.1.0) + actionview (= 4.1.0) mail (~> 2.5.4) - actionpack (4.1.0.rc2) - actionview (= 4.1.0.rc2) - activesupport (= 4.1.0.rc2) + actionpack (4.1.0) + actionview (= 4.1.0) + activesupport (= 4.1.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.0.rc2) - activesupport (= 4.1.0.rc2) + actionview (4.1.0) + activesupport (= 4.1.0) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.0.rc2) - activesupport (= 4.1.0.rc2) + activemodel (4.1.0) + activesupport (= 4.1.0) builder (~> 3.1) - activerecord (4.1.0.rc2) - activemodel (= 4.1.0.rc2) - activesupport (= 4.1.0.rc2) + activerecord (4.1.0) + activemodel (= 4.1.0) + activesupport (= 4.1.0) 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.rc2) + activesupport (4.1.0) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -72,24 +72,24 @@ rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - 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) + rails (4.1.0) + actionmailer (= 4.1.0) + actionpack (= 4.1.0) + actionview (= 4.1.0) + activemodel (= 4.1.0) + activerecord (= 4.1.0) + activesupport (= 4.1.0) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.0.rc2) - sprockets-rails (~> 2.0.0) - railties (4.1.0.rc2) - actionpack (= 4.1.0.rc2) - activesupport (= 4.1.0.rc2) + railties (= 4.1.0) + sprockets-rails (~> 2.0) + railties (4.1.0) + actionpack (= 4.1.0) + activesupport (= 4.1.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) rake (10.2.2) - sass (3.2.18) + sass (3.2.19) sass-rails (4.0.3) railties (>= 4.0.0, < 5.0) sass (~> 3.2.0) @@ -100,7 +100,7 @@ multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.1) + sprockets-rails (2.1.1) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) @@ -108,8 +108,8 @@ therubyrhino_jar (>= 1.7.3) therubyrhino_jar (1.7.4) thor (0.19.1) - thread_safe (0.3.2) - thread_safe (0.3.2-java) + thread_safe (0.3.3) + thread_safe (0.3.3-java) tilt (1.4.1) treetop (1.4.15) polyglot @@ -139,8 +139,8 @@ pg puma quiet_assets - rails (~> 4.1.0.rc1) - sass-rails (~> 4.0.0.rc1) + rails (~> 4.1.0) + sass-rails therubyrhino uglifier unicorn