From 940b755c6423948a3604b9be71b579f4c8e9dc7f Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Fri, 14 Nov 2014 10:58:58 -0800
Subject: [PATCH 01/24] Update Rails version & eliminate specific Ruby

---
 Gemfile      |   7 ++-
 Gemfile.lock | 117 ++++++++++++++++++++++++++-------------------------
 2 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1a29225d..8f1be314 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
-ruby   '2.1.1'
 
-gem 'rails',                   '4.2.0.beta2'
+gem 'rails',                   '4.2.0.beta4'
 gem 'bcrypt',                  '3.1.7'
 gem 'faker',                   '1.4.2'
 gem 'carrierwave',             '0.10.0'
@@ -13,9 +12,9 @@ gem 'bootstrap-sass',          '3.2.0.0'
 gem 'sass-rails',              '5.0.0.beta1'
 gem 'uglifier',                '2.5.3'
 gem 'coffee-rails',            '4.0.1'
-gem 'jquery-rails',            '3.1.2'
+gem 'jquery-rails',            '4.0.0.beta2'
 gem 'turbolinks',              '2.3.0'
-gem 'jbuilder',                '2.1.3'
+gem 'jbuilder',                '2.2.3'
 gem 'rails-html-sanitizer',    '1.0.1'
 gem 'sdoc',                    '0.4.0', group: :doc
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 85d4272f..a3d70e33 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,43 +1,43 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.0.beta2)
-      actionpack (= 4.2.0.beta2)
-      actionview (= 4.2.0.beta2)
-      activejob (= 4.2.0.beta2)
+    actionmailer (4.2.0.beta4)
+      actionpack (= 4.2.0.beta4)
+      actionview (= 4.2.0.beta4)
+      activejob (= 4.2.0.beta4)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.3)
-    actionpack (4.2.0.beta2)
-      actionview (= 4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
+      rails-dom-testing (~> 1.0, >= 1.0.4)
+    actionpack (4.2.0.beta4)
+      actionview (= 4.2.0.beta4)
+      activesupport (= 4.2.0.beta4)
       rack (~> 1.6.0.beta)
       rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.3)
+      rails-dom-testing (~> 1.0, >= 1.0.4)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
+    actionview (4.2.0.beta4)
+      activesupport (= 4.2.0.beta4)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.3)
+      rails-dom-testing (~> 1.0, >= 1.0.4)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
+    activejob (4.2.0.beta4)
+      activesupport (= 4.2.0.beta4)
       globalid (>= 0.3.0)
-    activemodel (4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
+    activemodel (4.2.0.beta4)
+      activesupport (= 4.2.0.beta4)
       builder (~> 3.1)
-    activerecord (4.2.0.beta2)
-      activemodel (= 4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
-      arel (>= 6.0.0.beta1, < 6.1)
-    activesupport (4.2.0.beta2)
+    activerecord (4.2.0.beta4)
+      activemodel (= 4.2.0.beta4)
+      activesupport (= 4.2.0.beta4)
+      arel (>= 6.0.0.beta2, < 6.1)
+    activesupport (4.2.0.beta4)
       i18n (>= 0.7.0.beta1, < 0.8)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     ansi (1.4.3)
-    arel (6.0.0.beta1)
+    arel (6.0.0.beta2)
     bcrypt (3.1.7)
     binding_of_caller (0.7.3.pre1)
       debug_inspector (>= 0.0.1)
@@ -69,11 +69,11 @@ GEM
     debug_inspector (0.0.2)
     debugger-linecache (1.2.0)
     erubis (2.7.0)
-    excon (0.39.6)
-    execjs (2.2.1)
+    excon (0.41.0)
+    execjs (2.2.2)
     faker (1.4.2)
       i18n (~> 0.5)
-    ffi (1.9.5)
+    ffi (1.9.6)
     fog (1.23.0)
       fog-brightbox
       fog-core (~> 1.23)
@@ -81,7 +81,7 @@ GEM
       fog-softlayer
       ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
-    fog-brightbox (0.5.1)
+    fog-brightbox (0.6.1)
       fog-core (~> 1.22)
       fog-json
       inflecto
@@ -94,13 +94,13 @@ GEM
       net-ssh (>= 2.1.3)
     fog-json (1.0.0)
       multi_json (~> 1.0)
-    fog-softlayer (0.3.18)
+    fog-softlayer (0.3.24)
       fog-core
       fog-json
     formatador (0.2.5)
     globalid (0.3.0)
       activesupport (>= 4.1.0)
-    guard (2.6.1)
+    guard (2.8.2)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
@@ -114,32 +114,33 @@ GEM
     i18n (0.7.0.beta1)
     inflecto (0.0.2)
     ipaddress (0.8.0)
-    jbuilder (2.1.3)
+    jbuilder (2.2.3)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
-    jquery-rails (3.1.2)
-      railties (>= 3.0, < 5.0)
+    jquery-rails (4.0.0.beta2)
+      rails-dom-testing (~> 1.0)
+      railties (>= 4.2.0.beta, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
     kgio (2.9.2)
-    listen (2.7.11)
+    listen (2.7.12)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     loofah (2.0.1)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.9)
-    mail (2.6.1)
+    mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.3)
+    mime-types (2.4.3)
     mini_backtrace (0.1.3)
       minitest (> 1.2.0)
       rails (>= 2.3.3)
     mini_magick (3.8.0)
       subexec (~> 0.2.1)
-    mini_portile (0.6.0)
-    minitest (5.4.2)
+    mini_portile (0.6.1)
+    minitest (5.4.3)
     minitest-reporters (1.0.5)
       ansi
       builder
@@ -149,8 +150,8 @@ GEM
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
     pg (0.17.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -159,21 +160,21 @@ GEM
     rack (1.6.0.beta)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.2.0.beta2)
-      actionmailer (= 4.2.0.beta2)
-      actionpack (= 4.2.0.beta2)
-      actionview (= 4.2.0.beta2)
-      activejob (= 4.2.0.beta2)
-      activemodel (= 4.2.0.beta2)
-      activerecord (= 4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
+    rails (4.2.0.beta4)
+      actionmailer (= 4.2.0.beta4)
+      actionpack (= 4.2.0.beta4)
+      actionview (= 4.2.0.beta4)
+      activejob (= 4.2.0.beta4)
+      activemodel (= 4.2.0.beta4)
+      activerecord (= 4.2.0.beta4)
+      activesupport (= 4.2.0.beta4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0.beta2)
+      railties (= 4.2.0.beta4)
       sprockets-rails (~> 3.0.0.beta1)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.3)
-      activesupport
+    rails-dom-testing (1.0.4)
+      activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.1)
@@ -183,9 +184,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.2)
     rails_stdout_logging (0.0.3)
-    railties (4.2.0.beta2)
-      actionpack (= 4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
+    railties (4.2.0.beta4)
+      actionpack (= 4.2.0.beta4)
+      activesupport (= 4.2.0.beta4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
@@ -195,8 +196,8 @@ GEM
       ffi (>= 0.5.0)
     rdoc (4.1.2)
       json (~> 1.4)
-    ruby-progressbar (1.6.0)
-    sass (3.4.5)
+    ruby-progressbar (1.7.0)
+    sass (3.4.7)
     sass-rails (5.0.0.beta1)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.2)
@@ -207,7 +208,7 @@ GEM
       rdoc (~> 4.0, < 5.0)
     slop (3.6.0)
     spring (1.1.3)
-    sprockets (2.12.2)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -254,13 +255,13 @@ DEPENDENCIES
   faker (= 1.4.2)
   fog (= 1.23.0)
   guard-minitest (= 2.3.1)
-  jbuilder (= 2.1.3)
-  jquery-rails (= 3.1.2)
+  jbuilder (= 2.2.3)
+  jquery-rails (= 4.0.0.beta2)
   mini_backtrace (= 0.1.3)
   mini_magick (= 3.8.0)
   minitest-reporters (= 1.0.5)
   pg (= 0.17.1)
-  rails (= 4.2.0.beta2)
+  rails (= 4.2.0.beta4)
   rails-html-sanitizer (= 1.0.1)
   rails_12factor (= 0.0.2)
   sass-rails (= 5.0.0.beta1)

From 6531824ef4cb88ed055c4fb81097c31ae3a57bea Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Fri, 14 Nov 2014 11:27:04 -0800
Subject: [PATCH 02/24] Update the Guardfile

Conflicts:
	Guardfile
---
 Guardfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Guardfile b/Guardfile
index 460db6ca..f30bb0f2 100644
--- a/Guardfile
+++ b/Guardfile
@@ -26,8 +26,8 @@ guard :minitest, spring: true, all_on_start: false do
     ['test/controllers/sessions_controller_test.rb',
      'test/integration/users_login_test.rb']
   end
-  watch('app/models/micropost.rb') do
-    ['test/models/micropost_test.rb', 'test/models/user_test.rb']
+  watch('app/controllers/account_activations_controller.rb') do
+    'test/integration/users_signup_test.rb'
   end
   watch(%r{app/views/users/*}) do
     resource_tests('users') +

From 59624f1580893d43f60790ce5ed16c3c2082cb0b Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Fri, 21 Nov 2014 20:27:39 -0800
Subject: [PATCH 03/24] Remove unused gem

---
 Gemfile      | 1 -
 Gemfile.lock | 1 -
 2 files changed, 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8f1be314..c2d92217 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,6 @@ gem 'coffee-rails',            '4.0.1'
 gem 'jquery-rails',            '4.0.0.beta2'
 gem 'turbolinks',              '2.3.0'
 gem 'jbuilder',                '2.2.3'
-gem 'rails-html-sanitizer',    '1.0.1'
 gem 'sdoc',                    '0.4.0', group: :doc
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index a3d70e33..0a918fd3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -262,7 +262,6 @@ DEPENDENCIES
   minitest-reporters (= 1.0.5)
   pg (= 0.17.1)
   rails (= 4.2.0.beta4)
-  rails-html-sanitizer (= 1.0.1)
   rails_12factor (= 0.0.2)
   sass-rails (= 5.0.0.beta1)
   sdoc (= 0.4.0)

From bf27243021052001382c7e38ab6e5e4daafd2016 Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Wed, 26 Nov 2014 13:10:22 -0800
Subject: [PATCH 04/24] Add explicit arel gem

---
 Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gemfile b/Gemfile
index c2d92217..3c255098 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,6 +15,7 @@ gem 'coffee-rails',            '4.0.1'
 gem 'jquery-rails',            '4.0.0.beta2'
 gem 'turbolinks',              '2.3.0'
 gem 'jbuilder',                '2.2.3'
+gem 'arel',                    '6.0.0.beta2'
 gem 'sdoc',                    '0.4.0', group: :doc
 
 group :development, :test do

From 94799c0e900e376cacfe1b365e36482a40e7bd75 Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Fri, 28 Nov 2014 23:13:38 -0800
Subject: [PATCH 05/24] Update to Rails 4.2.0.rc1

---
 Gemfile      |   3 +-
 Gemfile.lock | 102 +++++++++++++++++++++++++--------------------------
 2 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3c255098..f6eb00dd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails',                   '4.2.0.beta4'
+gem 'rails',                   '4.2.0.rc1'
 gem 'bcrypt',                  '3.1.7'
 gem 'faker',                   '1.4.2'
 gem 'carrierwave',             '0.10.0'
@@ -15,7 +15,6 @@ gem 'coffee-rails',            '4.0.1'
 gem 'jquery-rails',            '4.0.0.beta2'
 gem 'turbolinks',              '2.3.0'
 gem 'jbuilder',                '2.2.3'
-gem 'arel',                    '6.0.0.beta2'
 gem 'sdoc',                    '0.4.0', group: :doc
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 0a918fd3..b3b76a56 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,43 +1,43 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.0.beta4)
-      actionpack (= 4.2.0.beta4)
-      actionview (= 4.2.0.beta4)
-      activejob (= 4.2.0.beta4)
+    actionmailer (4.2.0.rc1)
+      actionpack (= 4.2.0.rc1)
+      actionview (= 4.2.0.rc1)
+      activejob (= 4.2.0.rc1)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.4)
-    actionpack (4.2.0.beta4)
-      actionview (= 4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
-      rack (~> 1.6.0.beta)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.0.rc1)
+      actionview (= 4.2.0.rc1)
+      activesupport (= 4.2.0.rc1)
+      rack (~> 1.6.0.beta2)
       rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
+    actionview (4.2.0.rc1)
+      activesupport (= 4.2.0.rc1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
+    activejob (4.2.0.rc1)
+      activesupport (= 4.2.0.rc1)
       globalid (>= 0.3.0)
-    activemodel (4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
+    activemodel (4.2.0.rc1)
+      activesupport (= 4.2.0.rc1)
       builder (~> 3.1)
-    activerecord (4.2.0.beta4)
-      activemodel (= 4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
-      arel (>= 6.0.0.beta2, < 6.1)
-    activesupport (4.2.0.beta4)
+    activerecord (4.2.0.rc1)
+      activemodel (= 4.2.0.rc1)
+      activesupport (= 4.2.0.rc1)
+      arel (~> 6.0)
+    activesupport (4.2.0.rc1)
       i18n (>= 0.7.0.beta1, < 0.8)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     ansi (1.4.3)
-    arel (6.0.0.beta2)
+    arel (6.0.0)
     bcrypt (3.1.7)
     binding_of_caller (0.7.3.pre1)
       debug_inspector (>= 0.0.1)
@@ -81,11 +81,11 @@ GEM
       fog-softlayer
       ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
-    fog-brightbox (0.6.1)
+    fog-brightbox (0.7.0)
       fog-core (~> 1.22)
       fog-json
-      inflecto
-    fog-core (1.24.0)
+      inflecto (~> 0.0.2)
+    fog-core (1.25.0)
       builder
       excon (~> 0.38)
       formatador (~> 0.2)
@@ -100,7 +100,7 @@ GEM
     formatador (0.2.5)
     globalid (0.3.0)
       activesupport (>= 4.1.0)
-    guard (2.8.2)
+    guard (2.9.2)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
@@ -123,7 +123,7 @@ GEM
       thor (>= 0.14, < 2.0)
     json (1.8.1)
     kgio (2.9.2)
-    listen (2.7.12)
+    listen (2.8.3)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -150,30 +150,30 @@ GEM
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
-    nokogiri (1.6.4.1)
+    nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
     pg (0.17.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.0.beta)
+    rack (1.6.0.beta2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.2.0.beta4)
-      actionmailer (= 4.2.0.beta4)
-      actionpack (= 4.2.0.beta4)
-      actionview (= 4.2.0.beta4)
-      activejob (= 4.2.0.beta4)
-      activemodel (= 4.2.0.beta4)
-      activerecord (= 4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
+    rails (4.2.0.rc1)
+      actionmailer (= 4.2.0.rc1)
+      actionpack (= 4.2.0.rc1)
+      actionview (= 4.2.0.rc1)
+      activejob (= 4.2.0.rc1)
+      activemodel (= 4.2.0.rc1)
+      activerecord (= 4.2.0.rc1)
+      activesupport (= 4.2.0.rc1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0.beta4)
-      sprockets-rails (~> 3.0.0.beta1)
+      railties (= 4.2.0.rc1)
+      sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.4)
+    rails-dom-testing (1.0.5)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
@@ -184,20 +184,20 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.2)
     rails_stdout_logging (0.0.3)
-    railties (4.2.0.beta4)
-      actionpack (= 4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
+    railties (4.2.0.rc1)
+      actionpack (= 4.2.0.rc1)
+      activesupport (= 4.2.0.rc1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
-    rake (10.3.2)
+    rake (10.4.0)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rdoc (4.1.2)
       json (~> 1.4)
     ruby-progressbar (1.7.0)
-    sass (3.4.7)
+    sass (3.4.9)
     sass-rails (5.0.0.beta1)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.2)
@@ -213,10 +213,10 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (3.0.0.beta1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (~> 2.8)
+    sprockets-rails (2.2.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.9)
     subexec (0.2.3)
     thor (0.19.1)
@@ -261,7 +261,7 @@ DEPENDENCIES
   mini_magick (= 3.8.0)
   minitest-reporters (= 1.0.5)
   pg (= 0.17.1)
-  rails (= 4.2.0.beta4)
+  rails (= 4.2.0.rc1)
   rails_12factor (= 0.0.2)
   sass-rails (= 5.0.0.beta1)
   sdoc (= 0.4.0)

From ba8d745056a9b1b599db8fdc1945b758aea4f4a3 Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Fri, 28 Nov 2014 23:27:23 -0800
Subject: [PATCH 06/24] Update coffee-rails

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index f6eb00dd..2ccd5dc7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem 'bootstrap-will_paginate', '0.0.10'
 gem 'bootstrap-sass',          '3.2.0.0'
 gem 'sass-rails',              '5.0.0.beta1'
 gem 'uglifier',                '2.5.3'
-gem 'coffee-rails',            '4.0.1'
+gem 'coffee-rails',            '4.1.0'
 gem 'jquery-rails',            '4.0.0.beta2'
 gem 'turbolinks',              '2.3.0'
 gem 'jbuilder',                '2.2.3'

From f63543cf020e39fc627f7e7259527bf7d00ac1fa Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Fri, 12 Dec 2014 19:47:06 -0800
Subject: [PATCH 07/24] Change navbar css

---
 app/views/layouts/_header.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index b404175e..1e535b96 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -2,7 +2,7 @@
   <div class="container">
     <%= link_to "sample app", root_path, id: "logo" %>
     <nav>
-      <ul class="nav navbar-nav pull-right">
+      <ul class="nav navbar-nav navbar-right">
         <li><%= link_to "Home",   root_path %></li>
         <li><%= link_to "Help",   help_path %></li>
         <li><%= link_to "Log in", '#' %></li>

From 3ce6e75a6261d2b979f17cff0d1b8d8ab5fcebef Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Fri, 12 Dec 2014 19:48:08 -0800
Subject: [PATCH 08/24] Bump version number

---
 Gemfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3c255098..bfb2d3cc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails',                   '4.2.0.beta4'
+gem 'rails',                   '4.2.0.rc3'
 gem 'bcrypt',                  '3.1.7'
 gem 'faker',                   '1.4.2'
 gem 'carrierwave',             '0.10.0'
@@ -11,11 +11,10 @@ gem 'bootstrap-will_paginate', '0.0.10'
 gem 'bootstrap-sass',          '3.2.0.0'
 gem 'sass-rails',              '5.0.0.beta1'
 gem 'uglifier',                '2.5.3'
-gem 'coffee-rails',            '4.0.1'
+gem 'coffee-rails',            '4.1.0'
 gem 'jquery-rails',            '4.0.0.beta2'
 gem 'turbolinks',              '2.3.0'
 gem 'jbuilder',                '2.2.3'
-gem 'arel',                    '6.0.0.beta2'
 gem 'sdoc',                    '0.4.0', group: :doc
 
 group :development, :test do

From 85555ad21c56603178458ee5c9d759f635ec615b Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Tue, 30 Dec 2014 14:37:42 -0800
Subject: [PATCH 09/24] Update Rails

---
 Gemfile      |   2 +-
 Gemfile.lock | 130 ++++++++++++++++++++++++++-------------------------
 2 files changed, 67 insertions(+), 65 deletions(-)

diff --git a/Gemfile b/Gemfile
index bfb2d3cc..971f4a4b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails',                   '4.2.0.rc3'
+gem 'rails',                   '4.2.0'
 gem 'bcrypt',                  '3.1.7'
 gem 'faker',                   '1.4.2'
 gem 'carrierwave',             '0.10.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0a918fd3..42f5ed7e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,43 +1,43 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.0.beta4)
-      actionpack (= 4.2.0.beta4)
-      actionview (= 4.2.0.beta4)
-      activejob (= 4.2.0.beta4)
+    actionmailer (4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.4)
-    actionpack (4.2.0.beta4)
-      actionview (= 4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
-      rack (~> 1.6.0.beta)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.0)
+      actionview (= 4.2.0)
+      activesupport (= 4.2.0)
+      rack (~> 1.6.0)
       rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
+    actionview (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
+    activejob (4.2.0)
+      activesupport (= 4.2.0)
       globalid (>= 0.3.0)
-    activemodel (4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
-    activerecord (4.2.0.beta4)
-      activemodel (= 4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
-      arel (>= 6.0.0.beta2, < 6.1)
-    activesupport (4.2.0.beta4)
-      i18n (>= 0.7.0.beta1, < 0.8)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     ansi (1.4.3)
-    arel (6.0.0.beta2)
+    arel (6.0.0)
     bcrypt (3.1.7)
     binding_of_caller (0.7.3.pre1)
       debug_inspector (>= 0.0.1)
@@ -58,18 +58,18 @@ GEM
     celluloid (0.16.0)
       timers (~> 4.0.0)
     coderay (1.1.0)
-    coffee-rails (4.0.1)
+    coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    columnize (0.8.9)
+    columnize (0.9.0)
     debug_inspector (0.0.2)
     debugger-linecache (1.2.0)
     erubis (2.7.0)
-    excon (0.41.0)
+    excon (0.42.1)
     execjs (2.2.2)
     faker (1.4.2)
       i18n (~> 0.5)
@@ -81,11 +81,11 @@ GEM
       fog-softlayer
       ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
-    fog-brightbox (0.6.1)
+    fog-brightbox (0.7.1)
       fog-core (~> 1.22)
       fog-json
-      inflecto
-    fog-core (1.24.0)
+      inflecto (~> 0.0.2)
+    fog-core (1.27.2)
       builder
       excon (~> 0.38)
       formatador (~> 0.2)
@@ -94,16 +94,17 @@ GEM
       net-ssh (>= 2.1.3)
     fog-json (1.0.0)
       multi_json (~> 1.0)
-    fog-softlayer (0.3.24)
+    fog-softlayer (0.3.26)
       fog-core
       fog-json
     formatador (0.2.5)
     globalid (0.3.0)
       activesupport (>= 4.1.0)
-    guard (2.8.2)
+    guard (2.10.5)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
     guard-minitest (2.3.1)
@@ -111,7 +112,7 @@ GEM
       minitest (>= 3.0)
     hike (1.2.3)
     hitimes (1.2.2)
-    i18n (0.7.0.beta1)
+    i18n (0.7.0)
     inflecto (0.0.2)
     ipaddress (0.8.0)
     jbuilder (2.2.3)
@@ -123,7 +124,7 @@ GEM
       thor (>= 0.14, < 2.0)
     json (1.8.1)
     kgio (2.9.2)
-    listen (2.7.12)
+    listen (2.8.4)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -139,41 +140,42 @@ GEM
       rails (>= 2.3.3)
     mini_magick (3.8.0)
       subexec (~> 0.2.1)
-    mini_portile (0.6.1)
-    minitest (5.4.3)
+    mini_portile (0.6.2)
+    minitest (5.5.0)
     minitest-reporters (1.0.5)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     multi_json (1.10.1)
+    nenv (0.1.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
-    nokogiri (1.6.4.1)
+    nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
     pg (0.17.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.0.beta)
+    rack (1.6.0)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.2.0.beta4)
-      actionmailer (= 4.2.0.beta4)
-      actionpack (= 4.2.0.beta4)
-      actionview (= 4.2.0.beta4)
-      activejob (= 4.2.0.beta4)
-      activemodel (= 4.2.0.beta4)
-      activerecord (= 4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
+    rails (4.2.0)
+      actionmailer (= 4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      activemodel (= 4.2.0)
+      activerecord (= 4.2.0)
+      activesupport (= 4.2.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0.beta4)
-      sprockets-rails (~> 3.0.0.beta1)
+      railties (= 4.2.0)
+      sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.4)
+    rails-dom-testing (1.0.5)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
@@ -182,22 +184,22 @@ GEM
     rails_12factor (0.0.2)
       rails_serve_static_assets
       rails_stdout_logging
-    rails_serve_static_assets (0.0.2)
+    rails_serve_static_assets (0.0.3)
     rails_stdout_logging (0.0.3)
-    railties (4.2.0.beta4)
-      actionpack (= 4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
+    railties (4.2.0)
+      actionpack (= 4.2.0)
+      activesupport (= 4.2.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rdoc (4.1.2)
+    rdoc (4.2.0)
       json (~> 1.4)
-    ruby-progressbar (1.7.0)
-    sass (3.4.7)
+    ruby-progressbar (1.7.1)
+    sass (3.4.9)
     sass-rails (5.0.0.beta1)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.2)
@@ -213,10 +215,10 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (3.0.0.beta1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (~> 2.8)
+    sprockets-rails (2.2.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.9)
     subexec (0.2.3)
     thor (0.19.1)
@@ -251,7 +253,7 @@ DEPENDENCIES
   bootstrap-will_paginate (= 0.0.10)
   byebug (= 3.4.0)
   carrierwave (= 0.10.0)
-  coffee-rails (= 4.0.1)
+  coffee-rails (= 4.1.0)
   faker (= 1.4.2)
   fog (= 1.23.0)
   guard-minitest (= 2.3.1)
@@ -261,7 +263,7 @@ DEPENDENCIES
   mini_magick (= 3.8.0)
   minitest-reporters (= 1.0.5)
   pg (= 0.17.1)
-  rails (= 4.2.0.beta4)
+  rails (= 4.2.0)
   rails_12factor (= 0.0.2)
   sass-rails (= 5.0.0.beta1)
   sdoc (= 0.4.0)

From d473037c9c870c10a05bf7cca651df19d6e70ae7 Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Tue, 6 Jan 2015 11:18:39 -0800
Subject: [PATCH 10/24] Update config.serve_static_files

---
 config/environments/production.rb | 2 +-
 config/environments/test.rb       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 7c017136..07a09548 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -21,7 +21,7 @@
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or NGINX will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 32756eb8..95864a58 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -13,7 +13,7 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

From 651c88eec9efe753c3ee2f8d83941898ddfdad8b Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Wed, 7 Jan 2015 12:41:20 -0800
Subject: [PATCH 11/24] Improve email length validation test

---
 test/models/user_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 0d702714..e0efdb4e 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -27,7 +27,7 @@ def setup
   end
   
   test "email should not be too long" do
-    @user.email = "a" * 256
+    @user.email = "a" * 244 + "@example.com"
     assert_not @user.valid?
   end
   

From cdabeaca07fb0eb9f25b07470c8592ef748d59e1 Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Fri, 16 Jan 2015 16:26:53 -0800
Subject: [PATCH 12/24] Update gems & config

---
 Gemfile                           |  4 ++--
 Gemfile.lock                      | 15 ++++++++-------
 config/environments/production.rb |  2 +-
 config/environments/test.rb       |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2ccd5dc7..a21510db 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,10 +9,10 @@ gem 'fog',                     '1.23.0'
 gem 'will_paginate',           '3.0.7'
 gem 'bootstrap-will_paginate', '0.0.10'
 gem 'bootstrap-sass',          '3.2.0.0'
-gem 'sass-rails',              '5.0.0.beta1'
+gem 'sass-rails',              '5.0.1'
 gem 'uglifier',                '2.5.3'
 gem 'coffee-rails',            '4.1.0'
-gem 'jquery-rails',            '4.0.0.beta2'
+gem 'jquery-rails',            '4.0.3'
 gem 'turbolinks',              '2.3.0'
 gem 'jbuilder',                '2.2.3'
 gem 'sdoc',                    '0.4.0', group: :doc
diff --git a/Gemfile.lock b/Gemfile.lock
index b3b76a56..e73ad751 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,9 +117,9 @@ GEM
     jbuilder (2.2.3)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
-    jquery-rails (4.0.0.beta2)
+    jquery-rails (4.0.3)
       rails-dom-testing (~> 1.0)
-      railties (>= 4.2.0.beta, < 5.0)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
     kgio (2.9.2)
@@ -198,11 +198,12 @@ GEM
       json (~> 1.4)
     ruby-progressbar (1.7.0)
     sass (3.4.9)
-    sass-rails (5.0.0.beta1)
+    sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2)
-      sprockets (~> 2.12)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
     sdoc (0.4.0)
       json (~> 1.8)
       rdoc (~> 4.0, < 5.0)
@@ -256,14 +257,14 @@ DEPENDENCIES
   fog (= 1.23.0)
   guard-minitest (= 2.3.1)
   jbuilder (= 2.2.3)
-  jquery-rails (= 4.0.0.beta2)
+  jquery-rails (= 4.0.3)
   mini_backtrace (= 0.1.3)
   mini_magick (= 3.8.0)
   minitest-reporters (= 1.0.5)
   pg (= 0.17.1)
   rails (= 4.2.0.rc1)
   rails_12factor (= 0.0.2)
-  sass-rails (= 5.0.0.beta1)
+  sass-rails (= 5.0.1)
   sdoc (= 0.4.0)
   spring (= 1.1.3)
   sqlite3 (= 1.3.9)
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 7c017136..07a09548 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -21,7 +21,7 @@
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or NGINX will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 32756eb8..badd9b99 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -13,7 +13,7 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

From 503a1753e639297a5dea3853f81aa16d8f00bcc4 Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Fri, 16 Jan 2015 16:35:21 -0800
Subject: [PATCH 13/24] Update gems & config

Conflicts:
	Gemfile.lock
---
 Gemfile.lock | 118 +++++++++++++++++++++++++++------------------------
 1 file changed, 63 insertions(+), 55 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e73ad751..70449ef2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,40 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.0.rc1)
-      actionpack (= 4.2.0.rc1)
-      actionview (= 4.2.0.rc1)
-      activejob (= 4.2.0.rc1)
+    actionmailer (4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.0.rc1)
-      actionview (= 4.2.0.rc1)
-      activesupport (= 4.2.0.rc1)
-      rack (~> 1.6.0.beta2)
+    actionpack (4.2.0)
+      actionview (= 4.2.0)
+      activesupport (= 4.2.0)
+      rack (~> 1.6.0)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0.rc1)
-      activesupport (= 4.2.0.rc1)
+    actionview (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0.rc1)
-      activesupport (= 4.2.0.rc1)
+    activejob (4.2.0)
+      activesupport (= 4.2.0)
       globalid (>= 0.3.0)
-    activemodel (4.2.0.rc1)
-      activesupport (= 4.2.0.rc1)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
-    activerecord (4.2.0.rc1)
-      activemodel (= 4.2.0.rc1)
-      activesupport (= 4.2.0.rc1)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
       arel (~> 6.0)
-    activesupport (4.2.0.rc1)
-      i18n (>= 0.7.0.beta1, < 0.8)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     ansi (1.4.3)
     arel (6.0.0)
@@ -58,18 +58,18 @@ GEM
     celluloid (0.16.0)
       timers (~> 4.0.0)
     coderay (1.1.0)
-    coffee-rails (4.0.1)
+    coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    columnize (0.8.9)
+    columnize (0.9.0)
     debug_inspector (0.0.2)
     debugger-linecache (1.2.0)
     erubis (2.7.0)
-    excon (0.41.0)
+    excon (0.43.0)
     execjs (2.2.2)
     faker (1.4.2)
       i18n (~> 0.5)
@@ -81,11 +81,11 @@ GEM
       fog-softlayer
       ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
-    fog-brightbox (0.7.0)
+    fog-brightbox (0.7.1)
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
-    fog-core (1.25.0)
+    fog-core (1.27.3)
       builder
       excon (~> 0.38)
       formatador (~> 0.2)
@@ -94,24 +94,27 @@ GEM
       net-ssh (>= 2.1.3)
     fog-json (1.0.0)
       multi_json (~> 1.0)
-    fog-softlayer (0.3.24)
+    fog-softlayer (0.3.30)
       fog-core
       fog-json
     formatador (0.2.5)
     globalid (0.3.0)
       activesupport (>= 4.1.0)
-    guard (2.9.2)
+    guard (2.11.1)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
       pry (>= 0.9.12)
+      shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-minitest (2.3.1)
       guard (~> 2.0)
       minitest (>= 3.0)
     hike (1.2.3)
     hitimes (1.2.2)
-    i18n (0.7.0.beta1)
+    i18n (0.7.0)
     inflecto (0.0.2)
     ipaddress (0.8.0)
     jbuilder (2.2.3)
@@ -121,9 +124,9 @@ GEM
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    kgio (2.9.2)
-    listen (2.8.3)
+    json (1.8.2)
+    kgio (2.9.3)
+    listen (2.8.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -139,37 +142,41 @@ GEM
       rails (>= 2.3.3)
     mini_magick (3.8.0)
       subexec (~> 0.2.1)
-    mini_portile (0.6.1)
-    minitest (5.4.3)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
     minitest-reporters (1.0.5)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     multi_json (1.10.1)
+    nenv (0.2.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.1)
+    net-ssh (2.9.2)
     nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
+    notiffany (0.0.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     pg (0.17.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.0.beta2)
-    rack-test (0.6.2)
+    rack (1.6.0)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.0.rc1)
-      actionmailer (= 4.2.0.rc1)
-      actionpack (= 4.2.0.rc1)
-      actionview (= 4.2.0.rc1)
-      activejob (= 4.2.0.rc1)
-      activemodel (= 4.2.0.rc1)
-      activerecord (= 4.2.0.rc1)
-      activesupport (= 4.2.0.rc1)
+    rails (4.2.0)
+      actionmailer (= 4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      activemodel (= 4.2.0)
+      activerecord (= 4.2.0)
+      activesupport (= 4.2.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0.rc1)
+      railties (= 4.2.0)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -182,21 +189,21 @@ GEM
     rails_12factor (0.0.2)
       rails_serve_static_assets
       rails_stdout_logging
-    rails_serve_static_assets (0.0.2)
+    rails_serve_static_assets (0.0.3)
     rails_stdout_logging (0.0.3)
-    railties (4.2.0.rc1)
-      actionpack (= 4.2.0.rc1)
-      activesupport (= 4.2.0.rc1)
+    railties (4.2.0)
+      actionpack (= 4.2.0)
+      activesupport (= 4.2.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
-    rake (10.4.0)
+    rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rdoc (4.1.2)
+    rdoc (4.2.0)
       json (~> 1.4)
-    ruby-progressbar (1.7.0)
+    ruby-progressbar (1.7.1)
     sass (3.4.9)
     sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
@@ -207,6 +214,7 @@ GEM
     sdoc (0.4.0)
       json (~> 1.8)
       rdoc (~> 4.0, < 5.0)
+    shellany (0.0.1)
     slop (3.6.0)
     spring (1.1.3)
     sprockets (2.12.3)
@@ -214,7 +222,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.1)
+    sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -252,7 +260,7 @@ DEPENDENCIES
   bootstrap-will_paginate (= 0.0.10)
   byebug (= 3.4.0)
   carrierwave (= 0.10.0)
-  coffee-rails (= 4.0.1)
+  coffee-rails (= 4.1.0)
   faker (= 1.4.2)
   fog (= 1.23.0)
   guard-minitest (= 2.3.1)
@@ -262,7 +270,7 @@ DEPENDENCIES
   mini_magick (= 3.8.0)
   minitest-reporters (= 1.0.5)
   pg (= 0.17.1)
-  rails (= 4.2.0.rc1)
+  rails (= 4.2.0)
   rails_12factor (= 0.0.2)
   sass-rails (= 5.0.1)
   sdoc (= 0.4.0)

From 53c1d9d1a3cdece845c5b9ec099f702224fd41d8 Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Fri, 16 Jan 2015 16:52:49 -0800
Subject: [PATCH 14/24] Update Gemfile

---
 Gemfile      | 4 ++--
 Gemfile.lock | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index a21510db..1be6c42c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails',                   '4.2.0.rc1'
+gem 'rails',                   '4.2.0'
 gem 'bcrypt',                  '3.1.7'
 gem 'faker',                   '1.4.2'
 gem 'carrierwave',             '0.10.0'
@@ -34,4 +34,4 @@ group :production do
   gem 'pg',             '0.17.1'
   gem 'rails_12factor', '0.0.2'
   gem 'unicorn',        '4.8.3'
-end
\ No newline at end of file
+end
diff --git a/Gemfile.lock b/Gemfile.lock
index 70449ef2..8b581716 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ansi (1.4.3)
+    ansi (1.5.0)
     arel (6.0.0)
     bcrypt (3.1.7)
     binding_of_caller (0.7.3.pre1)

From 85c963527adee2a90e70df9e3c87cefedaa73127 Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Fri, 16 Jan 2015 18:57:04 -0800
Subject: [PATCH 15/24] Add schema

---
 db/schema.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/schema.rb b/db/schema.rb
index a67a8b9b..4f0c04c9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -13,7 +13,7 @@
 
 ActiveRecord::Schema.define(version: 20141014234032) do
 
-  create_table "users", force: true do |t|
+  create_table "users", force: :cascade do |t|
     t.string   "name"
     t.string   "email"
     t.datetime "created_at",      null: false

From d3b408132e508fea3ff2048bb56b4cf744bff4e9 Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Fri, 16 Jan 2015 18:59:24 -0800
Subject: [PATCH 16/24] Add schema

---
 db/schema.rb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/db/schema.rb b/db/schema.rb
index 4f0c04c9..346cc2b6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,18 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141014234032) do
+ActiveRecord::Schema.define(version: 20141111014949) do
+
+  create_table "microposts", force: :cascade do |t|
+    t.text     "content"
+    t.integer  "user_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string   "picture"
+  end
+
+  add_index "microposts", ["user_id", "created_at"], name: "index_microposts_on_user_id_and_created_at"
+  add_index "microposts", ["user_id"], name: "index_microposts_on_user_id"
 
   create_table "users", force: :cascade do |t|
     t.string   "name"

From c6b8f6818fbd83fdc7610d516ce31b62cce64d2e Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Mon, 16 Feb 2015 15:02:53 -0800
Subject: [PATCH 17/24] Remove overflow-y rulse

---
 app/assets/stylesheets/custom.css.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 7bd784dc..7be6c379 100644
--- a/app/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
@@ -7,10 +7,6 @@ $gray-medium-light: #eaeaea;
 
 /* universal */
 
-html {
-  overflow-y: scroll;
-}
-
 body {
   padding-top: 60px;
 }

From ab304f3dd6e829f7a5aa2adcd261345ecc02dd99 Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Mon, 13 Apr 2015 13:57:59 -0700
Subject: [PATCH 18/24] Add Sass dependency

---
 Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gemfile b/Gemfile
index bc0068b0..886a2a00 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,7 @@ gem 'fog',                     '1.23.0'
 gem 'will_paginate',           '3.0.7'
 gem 'bootstrap-will_paginate', '0.0.10'
 gem 'bootstrap-sass',          '3.2.0.0'
+gem 'sass',                    '3.4.13'
 gem 'sass-rails',              '5.0.1'
 gem 'uglifier',                '2.5.3'
 gem 'coffee-rails',            '4.1.0'

From a613024450baff6e925b00ca8fbdaefe16cf3240 Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Fri, 17 Apr 2015 16:43:46 -0700
Subject: [PATCH 19/24] Use better fix for Sass issue

---
 Gemfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 886a2a00..e80225e3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,8 +9,7 @@ gem 'fog',                     '1.23.0'
 gem 'will_paginate',           '3.0.7'
 gem 'bootstrap-will_paginate', '0.0.10'
 gem 'bootstrap-sass',          '3.2.0.0'
-gem 'sass',                    '3.4.13'
-gem 'sass-rails',              '5.0.1'
+gem 'sass-rails',              '5.0.2'
 gem 'uglifier',                '2.5.3'
 gem 'coffee-rails',            '4.1.0'
 gem 'jquery-rails',            '4.0.0.beta2'

From 88601c2c0fc436fba6b103737e0429869e5d5a65 Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Fri, 8 May 2015 11:20:49 -0700
Subject: [PATCH 20/24] Switch to string concatenation in full_helper

---
 Gemfile.lock                      | 4 ++--
 app/helpers/application_helper.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index dc33b25b..b2f77e3d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -205,7 +205,7 @@ GEM
       json (~> 1.4)
     ruby-progressbar (1.7.1)
     sass (3.4.12)
-    sass-rails (5.0.1)
+    sass-rails (5.0.2)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
@@ -272,7 +272,7 @@ DEPENDENCIES
   pg (= 0.17.1)
   rails (= 4.2.0)
   rails_12factor (= 0.0.2)
-  sass-rails (= 5.0.1)
+  sass-rails (= 5.0.2)
   sdoc (= 0.4.0)
   spring (= 1.1.3)
   sqlite3 (= 1.3.9)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 29f39b8a..6340bec2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,12 +1,12 @@
 module ApplicationHelper
-  
+
   # Returns the full title on a per-page basis.
   def full_title(page_title = '')
     base_title = "Ruby on Rails Tutorial Sample App"
     if page_title.empty?
       base_title
     else
-      "#{page_title} | #{base_title}"
+      page_title + " | " + base_title
     end
   end
 end

From 01c4c5c5a536ee44a1b6927750111ccc00d74af4 Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Fri, 22 May 2015 10:07:38 -0700
Subject: [PATCH 21/24] Add test for blank passwords and a presence validation

---
 app/models/user.rb       |  2 +-
 test/models/user_test.rb | 25 +++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 4607312f..a43ee558 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -6,5 +6,5 @@ class User < ActiveRecord::Base
                     format: { with: VALID_EMAIL_REGEX },
                     uniqueness: { case_sensitive: false }
   has_secure_password
-  validates :password, length: { minimum: 6 }
+  validates :password, presence: true, length: { minimum: 6 }
 end
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index e0efdb4e..0263f5d8 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -1,36 +1,36 @@
 require 'test_helper'
 
 class UserTest < ActiveSupport::TestCase
-  
+
   def setup
     @user = User.new(name: "Example User", email: "user@example.com",
                      password: "foobar", password_confirmation: "foobar")
   end
-  
+
   test "should be valid" do
     assert @user.valid?
   end
-  
+
   test "name should be present" do
     @user.name = "     "
     assert_not @user.valid?
   end
-  
+
   test "email should be present" do
     @user.email = "     "
     assert_not @user.valid?
   end
-  
+
   test "name should not be too long" do
     @user.name = "a" * 51
     assert_not @user.valid?
   end
-  
+
   test "email should not be too long" do
     @user.email = "a" * 244 + "@example.com"
     assert_not @user.valid?
   end
-  
+
   test "email validation should accept valid addresses" do
     valid_addresses = %w[user@example.com USER@foo.COM A_US-ER@foo.bar.org
                          first.last@foo.jp alice+bob@baz.cn]
@@ -39,7 +39,7 @@ def setup
       assert @user.valid?, "#{valid_address.inspect} should be valid"
     end
   end
-  
+
   test "email validation should reject invalid addresses" do
     invalid_addresses = %w[user@example,com user_at_foo.org user.name@example.
                            foo@bar_baz.com foo@bar+baz.com]
@@ -48,14 +48,19 @@ def setup
       assert_not @user.valid?, "#{invalid_address.inspect} should be invalid"
     end
   end
-  
+
   test "email address should be unique" do
     duplicate_user = @user.dup
     duplicate_user.email = @user.email.upcase
     @user.save
     assert_not duplicate_user.valid?
   end
-  
+
+  test "password should be present (nonblank)" do
+    @user.password = @user.password_confirmation = " " * 6
+    assert_not @user.valid?
+  end
+
   test "password should have a minimum length" do
     @user.password = @user.password_confirmation = "a" * 5
     assert_not @user.valid?

From 39cfa407dad8134126803eaa5ee1f57e12435544 Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Wed, 17 Jun 2015 11:51:14 -0700
Subject: [PATCH 22/24] Bump version number

---
 Gemfile      |  2 +-
 Gemfile.lock | 90 +++++++++++++++++++++++++---------------------------
 2 files changed, 44 insertions(+), 48 deletions(-)

diff --git a/Gemfile b/Gemfile
index e80225e3..57d22a2e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails',                   '4.2.0'
+gem 'rails',                   '4.2.2'
 gem 'bcrypt',                  '3.1.7'
 gem 'faker',                   '1.4.2'
 gem 'carrierwave',             '0.10.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index b2f77e3d..708a7873 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,36 +1,36 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
+    actionmailer (4.2.2)
+      actionpack (= 4.2.2)
+      actionview (= 4.2.2)
+      activejob (= 4.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.0)
-      actionview (= 4.2.0)
-      activesupport (= 4.2.0)
-      rack (~> 1.6.0)
+    actionpack (4.2.2)
+      actionview (= 4.2.2)
+      activesupport (= 4.2.2)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0)
-      activesupport (= 4.2.0)
+    actionview (4.2.2)
+      activesupport (= 4.2.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0)
-      activesupport (= 4.2.0)
+    activejob (4.2.2)
+      activesupport (= 4.2.2)
       globalid (>= 0.3.0)
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.2)
+      activesupport (= 4.2.2)
       builder (~> 3.1)
-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
+    activerecord (4.2.2)
+      activemodel (= 4.2.2)
+      activesupport (= 4.2.2)
       arel (~> 6.0)
-    activesupport (4.2.0)
+    activesupport (4.2.2)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -98,7 +98,7 @@ GEM
       fog-core
       fog-json
     formatador (0.2.5)
-    globalid (0.3.3)
+    globalid (0.3.5)
       activesupport (>= 4.1.0)
     guard (2.12.1)
       formatador (>= 0.2.4)
@@ -112,7 +112,6 @@ GEM
     guard-minitest (2.3.1)
       guard (~> 2.0)
       minitest (>= 3.0)
-    hike (1.2.3)
     hitimes (1.2.2)
     i18n (0.7.0)
     inflecto (0.0.2)
@@ -124,32 +123,32 @@ GEM
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0.beta, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.2)
+    json (1.8.3)
     kgio (2.9.3)
     listen (2.8.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    loofah (2.0.1)
+    loofah (2.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.4.3)
+    mime-types (2.6.1)
     mini_backtrace (0.1.3)
       minitest (> 1.2.0)
       rails (>= 2.3.3)
     mini_magick (3.8.0)
       subexec (~> 0.2.1)
     mini_portile (0.6.2)
-    minitest (5.5.1)
+    minitest (5.7.0)
     minitest-reporters (1.0.5)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    multi_json (1.10.1)
+    multi_json (1.11.1)
     nenv (0.2.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -164,36 +163,36 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.0)
+    rack (1.6.2)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.0)
-      actionmailer (= 4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
-      activemodel (= 4.2.0)
-      activerecord (= 4.2.0)
-      activesupport (= 4.2.0)
+    rails (4.2.2)
+      actionmailer (= 4.2.2)
+      actionpack (= 4.2.2)
+      actionview (= 4.2.2)
+      activejob (= 4.2.2)
+      activemodel (= 4.2.2)
+      activerecord (= 4.2.2)
+      activesupport (= 4.2.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0)
+      railties (= 4.2.2)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.5)
+    rails-dom-testing (1.0.6)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
+    rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
     rails_12factor (0.0.2)
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.4)
     rails_stdout_logging (0.0.3)
-    railties (4.2.0)
-      actionpack (= 4.2.0)
-      activesupport (= 4.2.0)
+    railties (4.2.2)
+      actionpack (= 4.2.2)
+      activesupport (= 4.2.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
@@ -217,19 +216,16 @@ GEM
     shellany (0.0.1)
     slop (3.6.0)
     spring (1.1.3)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    sprockets (3.2.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
+    sprockets-rails (2.3.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.9)
     subexec (0.2.3)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
@@ -270,7 +266,7 @@ DEPENDENCIES
   mini_magick (= 3.8.0)
   minitest-reporters (= 1.0.5)
   pg (= 0.17.1)
-  rails (= 4.2.0)
+  rails (= 4.2.2)
   rails_12factor (= 0.0.2)
   sass-rails (= 5.0.2)
   sdoc (= 0.4.0)

From 7976647e1085509f9e4b9252a8627095c5b5f642 Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Mon, 28 Sep 2015 20:10:10 -0700
Subject: [PATCH 23/24] Remove erroneous presence validation

---
 app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index a43ee558..4607312f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -6,5 +6,5 @@ class User < ActiveRecord::Base
                     format: { with: VALID_EMAIL_REGEX },
                     uniqueness: { case_sensitive: false }
   has_secure_password
-  validates :password, presence: true, length: { minimum: 6 }
+  validates :password, length: { minimum: 6 }
 end

From 9b67bddb9ae9ce2cad89f6278420459b2783f6b0 Mon Sep 17 00:00:00 2001
From: Michael Hartl <michael@michaelhartl.com>
Date: Mon, 28 Sep 2015 20:49:02 -0700
Subject: [PATCH 24/24] Go back to previous solution

---
 app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 4607312f..a43ee558 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -6,5 +6,5 @@ class User < ActiveRecord::Base
                     format: { with: VALID_EMAIL_REGEX },
                     uniqueness: { case_sensitive: false }
   has_secure_password
-  validates :password, length: { minimum: 6 }
+  validates :password, presence: true, length: { minimum: 6 }
 end