diff --git a/ch14/students03/Gemfile b/ch14/students03/Gemfile index 540b314..8a0e032 100644 --- a/ch14/students03/Gemfile +++ b/ch14/students03/Gemfile @@ -1,6 +1,7 @@ source 'https://rubygems.org' -gem 'rails', github: "rails/rails" +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.0.0' gem 'sprockets-rails', github: "rails/sprockets-rails" gem 'sprockets', github: "rails/sprockets" gem 'sass-rails', github: "rails/sass-rails" diff --git a/ch14/students03/Gemfile.lock b/ch14/students03/Gemfile.lock index 28b45bc..d57333d 100644 --- a/ch14/students03/Gemfile.lock +++ b/ch14/students03/Gemfile.lock @@ -1,180 +1,175 @@ GIT remote: git://github.com/rack/rack.git - revision: 2ac599551d6147184321c42f40a0ab3241499b08 + revision: 25a549883b85fb33970b4a1530a365c0c9e51f95 specs: - rack (2.0.0.alpha) - json + rack (2.0.1) GIT remote: git://github.com/rails/arel.git - revision: ea2d50706a5f8215ff2346fa562423700b2d2b6e + revision: 6d2254ae4ac5a361c041783d742292acfa58e363 specs: - arel (7.0.0) + arel (7.0.1.pre) GIT remote: git://github.com/rails/coffee-rails.git - revision: fb0e42191e9d2fc0f9a56f0d2b3049f404c9eb97 + revision: 572d74dc6b4b65eeb610d7edc9978cce8901e2ca specs: - coffee-rails (4.1.1) + coffee-rails (4.2.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) - -GIT - remote: git://github.com/rails/rails.git - revision: a0d6209479bee220b43061d8ffa6a8d732ffd20d - specs: - actioncable (5.0.0.beta3) - actionpack (= 5.0.0.beta3) - nio4r (~> 1.2) - websocket-driver (~> 0.6.1) - actionmailer (5.0.0.beta3) - actionpack (= 5.0.0.beta3) - actionview (= 5.0.0.beta3) - activejob (= 5.0.0.beta3) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (5.0.0.beta3) - actionview (= 5.0.0.beta3) - activesupport (= 5.0.0.beta3) - rack (~> 2.x) - rack-test (~> 0.6.3) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.0.beta3) - activesupport (= 5.0.0.beta3) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (5.0.0.beta3) - activesupport (= 5.0.0.beta3) - globalid (>= 0.3.6) - activemodel (5.0.0.beta3) - activesupport (= 5.0.0.beta3) - activerecord (5.0.0.beta3) - activemodel (= 5.0.0.beta3) - activesupport (= 5.0.0.beta3) - arel (~> 7.0) - activesupport (5.0.0.beta3) - concurrent-ruby (~> 1.0) - i18n (~> 0.7) - minitest (~> 5.1) - tzinfo (~> 1.1) - rails (5.0.0.beta3) - actioncable (= 5.0.0.beta3) - actionmailer (= 5.0.0.beta3) - actionpack (= 5.0.0.beta3) - actionview (= 5.0.0.beta3) - activejob (= 5.0.0.beta3) - activemodel (= 5.0.0.beta3) - activerecord (= 5.0.0.beta3) - activesupport (= 5.0.0.beta3) - bundler (>= 1.3.0, < 2.0) - railties (= 5.0.0.beta3) - sprockets-rails (>= 2.0.0) - railties (5.0.0.beta3) - actionpack (= 5.0.0.beta3) - activesupport (= 5.0.0.beta3) - method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + railties (>= 4.0.0, < 5.2.x) GIT remote: git://github.com/rails/sass-rails.git - revision: 6e4eee736bcbfa5b2962467673c7a51abf434c67 + revision: dfbcc6a53653d8908007e26324a0f299f026ec4f specs: - sass-rails (6.0.0) - railties (>= 4.0.0, < 5.0) + sass-rails (6.0.0.beta1) + railties (>= 4.0.0, < 5.1) sass (~> 3.4) - sprockets (>= 4.0) + sprockets (~> 4.x) sprockets-rails (< 4.0) GIT remote: git://github.com/rails/sprockets-rails.git - revision: 419958f24fb4ce2d4c86f68f87c5a76767f3aa88 + revision: df5950017d7f2aa6fcbfa3949edfef85c35c28c7 specs: - sprockets-rails (3.0.0) + sprockets-rails (3.1.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) GIT remote: git://github.com/rails/sprockets.git - revision: 47ac6ad00408bd1636e522e8977324e5138e74a4 + revision: 98e9823150b1a5790c56874db6d342a5f6af8b91 specs: - sprockets (4.0.0) + sprockets (4.0.0.beta2) concurrent-ruby (~> 1.0) rack (> 1, < 3) GIT remote: git://github.com/rails/web-console.git - revision: 685962ebe4874a12c1e472807917b66867f42636 + revision: 04a941c001e87711a82524beaea9089a8635a323 specs: - web-console (3.0.0) - activemodel (>= 4.2) + web-console (3.3.1) + actionview (>= 5.0) + activemodel (>= 5.0) debug_inspector - railties (>= 4.2) + railties (>= 5.0) GEM remote: https://rubygems.org/ specs: - bcrypt (3.1.10) + actioncable (5.0.0) + actionpack (= 5.0.0) + nio4r (~> 1.2) + websocket-driver (~> 0.6.1) + actionmailer (5.0.0) + actionpack (= 5.0.0) + actionview (= 5.0.0) + activejob (= 5.0.0) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.0.0) + actionview (= 5.0.0) + activesupport (= 5.0.0) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.0.0) + activesupport (= 5.0.0) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (5.0.0) + activesupport (= 5.0.0) + globalid (>= 0.3.6) + activemodel (5.0.0) + activesupport (= 5.0.0) + activerecord (5.0.0) + activemodel (= 5.0.0) + activesupport (= 5.0.0) + arel (~> 7.0) + activesupport (5.0.0) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + bcrypt (3.1.11) builder (3.2.2) - byebug (8.2.1) + byebug (9.0.5) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.10.0) - concurrent-ruby (1.0.0) + concurrent-ruby (1.0.2) debug_inspector (0.0.2) erubis (2.7.0) - execjs (2.6.0) + execjs (2.7.0) globalid (0.3.6) activesupport (>= 4.1.0) i18n (0.7.0) - jbuilder (2.3.2) - activesupport (>= 3.0.0, < 5) + jbuilder (2.5.0) + activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) - jquery-rails (4.0.5) - rails-dom-testing (~> 1.0) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.3) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.6.4) + mime-types (>= 1.16, < 4) method_source (0.8.2) - mime-types (2.99.1) - mini_portile2 (2.0.0) - minitest (5.8.4) - multi_json (1.11.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.9.0) + multi_json (1.12.1) nio4r (1.2.1) - nokogiri (1.6.7.1) - mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + pkg-config (1.1.7) rack-test (0.6.3) rack (>= 1.0) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) + rails (5.0.0) + actioncable (= 5.0.0) + actionmailer (= 5.0.0) + actionpack (= 5.0.0) + actionview (= 5.0.0) + activejob (= 5.0.0) + activemodel (= 5.0.0) + activerecord (= 5.0.0) + activesupport (= 5.0.0) + bundler (>= 1.3.0, < 2.0) + railties (= 5.0.0) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.1) + activesupport (>= 4.2.0, < 6.0) nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - rake (10.5.0) - sass (3.4.20) + railties (5.0.0) + actionpack (= 5.0.0) + activesupport (= 5.0.0) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (11.2.2) + sass (3.4.22) sqlite3 (1.3.11) thor (0.19.1) thread_safe (0.3.5) - turbolinks (2.5.3) - coffee-rails + turbolinks (5.0.0) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - websocket-driver (0.6.3) + uglifier (3.0.0) + execjs (>= 0.3.0, < 3) + websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -189,7 +184,7 @@ DEPENDENCIES jbuilder (~> 2.0) jquery-rails rack! - rails! + rails (~> 5.0.0) sass-rails! sprockets! sprockets-rails!