diff --git a/Gemfile b/Gemfile index dee7341..d549ce2 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' ruby '1.9.3' #ruby-gemset=railstutorial_rails_4_0 -gem 'rails', '6.0.3.5' +gem 'rails', '4.0.3' group :development do gem 'sqlite3', '1.3.8' diff --git a/Gemfile.lock b/Gemfile.lock index 89568fa..dbbaa5b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,32 +1,31 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.2) - actionpack (= 4.0.2) + actionmailer (4.0.3) + actionpack (= 4.0.3) mail (~> 2.5.4) - actionpack (4.0.2) - activesupport (= 4.0.2) + actionpack (4.0.3) + activesupport (= 4.0.3) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.2) - activesupport (= 4.0.2) + activemodel (4.0.3) + activesupport (= 4.0.3) builder (~> 3.1.0) - activerecord (4.0.2) - activemodel (= 4.0.2) + activerecord (4.0.3) + activemodel (= 4.0.3) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.2) + activesupport (= 4.0.3) arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.3) - activesupport (4.0.2) + activerecord-deprecated_finders (1.0.4) + activesupport (4.0.3) i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - arel (4.0.1) - atomic (1.1.14) + arel (4.0.2) builder (3.1.4) coffee-rails (4.0.1) coffee-script (>= 2.2.0) @@ -35,40 +34,42 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) + concurrent-ruby (1.1.8) erubis (2.7.0) execjs (2.0.2) hike (1.2.3) - i18n (0.6.9) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (1.0.2) activesupport (>= 3.0.0) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) - mail (2.5.4) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) minitest (4.7.5) - multi_json (1.8.2) - polyglot (0.3.3) - rack (1.5.2) - rack-test (0.6.2) + multi_json (1.15.0) + polyglot (0.3.5) + rack (1.5.5) + rack-test (0.6.3) rack (>= 1.0) - rails (4.0.2) - actionmailer (= 4.0.2) - actionpack (= 4.0.2) - activerecord (= 4.0.2) - activesupport (= 4.0.2) + rails (4.0.3) + actionmailer (= 4.0.3) + actionpack (= 4.0.3) + activerecord (= 4.0.3) + activesupport (= 4.0.3) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.2) + railties (= 4.0.3) sprockets-rails (~> 2.0.0) - railties (4.0.2) - actionpack (= 4.0.2) - activesupport (= 4.0.2) + railties (4.0.3) + actionpack (= 4.0.3) + activesupport (= 4.0.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.0) + rake (12.2.1) rdoc (3.12.2) json (~> 1.4) sass (3.2.12) @@ -79,7 +80,7 @@ GEM sdoc (0.3.20) json (>= 1.1.3) rdoc (~> 3.10) - sprockets (2.10.1) + sprockets (2.12.5) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -88,29 +89,30 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) + sqlite3 (1.3.8) sqlite3 (1.3.8-x86-mingw32) - thor (0.18.1) - thread_safe (0.1.3) - atomic + thor (0.20.3) + thread_safe (0.3.6) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) turbolinks (1.1.1) coffee-rails - tzinfo (0.3.38) + tzinfo (0.3.60) uglifier (2.1.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) PLATFORMS + ruby x86-mingw32 DEPENDENCIES coffee-rails (= 4.0.1) jbuilder (= 1.0.2) jquery-rails (= 3.0.4) - rails (= 4.0.2) + rails (= 4.0.3) sass-rails (= 4.0.1) sdoc (= 0.3.20) sqlite3 (= 1.3.8)