# HG changeset patch # User edogawaconan # Date 1392783072 -32400 # Node ID 6021962213509d6092ed028eadd1f0babf914354 # Parent 5e16fc534c76243c331734e57a3eb4c347d6f235 Welcome to rails 4.1. diff -r 5e16fc534c76 -r 602196221350 Gemfile --- a/Gemfile Wed Feb 19 13:04:48 2014 +0900 +++ b/Gemfile Wed Feb 19 13:11:12 2014 +0900 @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "rails", "~> 4.0.0.rc1" +gem "rails", "~> 4.1.0.rc1" gem "jquery-rails" # Bundle edge Rails instead: diff -r 5e16fc534c76 -r 602196221350 Gemfile.lock --- a/Gemfile.lock Wed Feb 19 13:04:48 2014 +0900 +++ b/Gemfile.lock Wed Feb 19 13:11:12 2014 +0900 @@ -1,45 +1,47 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.3) - actionpack (= 4.0.3) + actionmailer (4.1.0.rc1) + actionpack (= 4.1.0.rc1) + actionview (= 4.1.0.rc1) mail (~> 2.5.4) - actionpack (4.0.3) - activesupport (= 4.0.3) - builder (~> 3.1.0) - erubis (~> 2.7.0) + actionpack (4.1.0.rc1) + actionview (= 4.1.0.rc1) + activesupport (= 4.1.0.rc1) rack (~> 1.5.2) rack-test (~> 0.6.2) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - activemodel (4.0.3) - activesupport (= 4.0.3) - builder (~> 3.1.0) - activerecord (4.0.3) - activemodel (= 4.0.3) - activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.3) - arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.3) + actionview (4.1.0.rc1) + activesupport (= 4.1.0.rc1) + builder (~> 3.1) + erubis (~> 2.7.0) + activemodel (4.1.0.rc1) + activesupport (= 4.1.0.rc1) + builder (~> 3.1) + activerecord (4.1.0.rc1) + activemodel (= 4.1.0.rc1) + activesupport (= 4.1.0.rc1) + 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.0.3) - i18n (~> 0.6, >= 0.6.4) - minitest (~> 4.2) - multi_json (~> 1.3) + activesupport (4.1.0.rc1) + i18n (~> 0.6, >= 0.6.9) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) thread_safe (~> 0.1) - tzinfo (~> 0.3.37) + tzinfo (~> 1.1) anjlab-bootstrap-rails (3.0.3.0) railties (>= 3.0) sass (>= 3.2) - arel (4.0.2) + arel (5.0.0) atomic (1.1.14) atomic (1.1.14-java) bouncy-castle-java (1.5.0147) - builder (3.1.4) + builder (3.2.2) erubis (2.7.0) execjs (2.0.2) hike (1.2.3) @@ -57,7 +59,7 @@ mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) - minitest (4.7.5) + minitest (5.2.3) multi_json (1.8.4) newrelic_rpm (3.7.2.195) pg (0.17.1) @@ -71,17 +73,19 @@ rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (4.0.3) - actionmailer (= 4.0.3) - actionpack (= 4.0.3) - activerecord (= 4.0.3) - activesupport (= 4.0.3) + 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) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.3) + railties (= 4.1.0.rc1) sprockets-rails (~> 2.0.0) - railties (4.0.3) - actionpack (= 4.0.3) - activesupport (= 4.0.3) + railties (4.1.0.rc1) + actionpack (= 4.1.0.rc1) + activesupport (= 4.1.0.rc1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) @@ -112,7 +116,8 @@ treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.38) + tzinfo (1.1.0) + thread_safe (~> 0.1) uglifier (2.4.0) execjs (>= 0.3.0) json (>= 1.8.0) @@ -135,7 +140,7 @@ pg puma quiet_assets - rails (~> 4.0.0.rc1) + rails (~> 4.1.0.rc1) sass-rails (~> 4.0.0.rc1) therubyrhino uglifier