From 4b00b81f6fc7bf48fad78448306c7c6a9c204627 Mon Sep 17 00:00:00 2001
From: Eric Guo <eric.guo@sandisk.com>
Date: Sun, 21 Dec 2014 20:16:46 +0800
Subject: [PATCH 01/15] upgrade to rails 4.0.12

---
 Gemfile      |  3 +--
 Gemfile.lock | 44 ++++++++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/Gemfile b/Gemfile
index b11143e..8109316 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
-ruby "2.1.0"
 
-gem 'rails', '4.0.2'
+gem 'rails', '4.0.12'
 
 gem 'coffee-rails'
 gem 'decent_exposure'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5209669..39726c5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,31 +1,31 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.2)
-      actionpack (= 4.0.2)
+    actionmailer (4.0.12)
+      actionpack (= 4.0.12)
       mail (~> 2.5.4)
-    actionpack (4.0.2)
-      activesupport (= 4.0.2)
+    actionpack (4.0.12)
+      activesupport (= 4.0.12)
       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.12)
+      activesupport (= 4.0.12)
       builder (~> 3.1.0)
-    activerecord (4.0.2)
-      activemodel (= 4.0.2)
+    activerecord (4.0.12)
+      activemodel (= 4.0.12)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.2)
+      activesupport (= 4.0.12)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.2)
+    activesupport (4.0.12)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    arel (4.0.2)
+    arel (4.0.12)
     atomic (1.1.16)
     better_errors (1.1.0)
       coderay (>= 1.0.0)
@@ -86,29 +86,29 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       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.12)
+      actionmailer (= 4.0.12)
+      actionpack (= 4.0.12)
+      activerecord (= 4.0.12)
+      activesupport (= 4.0.12)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.2)
+      railties (= 4.0.12)
       sprockets-rails (~> 2.0.0)
     rails_12factor (0.0.2)
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.2)
     rails_stdout_logging (0.0.3)
-    railties (4.0.2)
-      actionpack (= 4.0.2)
-      activesupport (= 4.0.2)
+    railties (4.0.12)
+      actionpack (= 4.0.12)
+      activesupport (= 4.0.12)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.2.0)
     redcarpet (3.1.1)
     rouge (1.3.3)
     sass (3.2.18)
-    sass-rails (4.0.2)
+    sass-rails (4.0.12)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.2.0)
       sprockets (~> 2.8, <= 2.11.0)
@@ -150,7 +150,7 @@ DEPENDENCIES
   pg
   pry-rails
   puma
-  rails (= 4.0.2)
+  rails (= 4.0.12)
   rails_12factor
   redcarpet
   rouge

From ab18ecf898d3af716257c8d74dd102b5eefbc4a8 Mon Sep 17 00:00:00 2001
From: Eric Guo <eric.guo@sandisk.com>
Date: Sun, 21 Dec 2014 20:28:06 +0800
Subject: [PATCH 02/15] upgrade to more updated gems

---
 Gemfile.lock | 117 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 64 insertions(+), 53 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 39726c5..476c252 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     actionmailer (4.0.12)
       actionpack (= 4.0.12)
-      mail (~> 2.5.4)
+      mail (~> 2.5, >= 2.5.4)
     actionpack (4.0.12)
       activesupport (= 4.0.12)
       builder (~> 3.1.0)
@@ -20,68 +20,77 @@ GEM
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
     activesupport (4.0.12)
-      i18n (~> 0.6, >= 0.6.4)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    arel (4.0.12)
-    atomic (1.1.16)
-    better_errors (1.1.0)
+    arel (4.0.2)
+    better_errors (2.0.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
+      rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.1.4)
     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.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.8.0)
     debug_inspector (0.0.2)
-    decent_exposure (2.3.1)
-    dotenv (0.11.1)
-      dotenv-deployment (~> 0.0.2)
-    dotenv-deployment (0.0.2)
-    dotenv-rails (0.11.1)
-      dotenv (= 0.11.1)
+    decent_exposure (2.3.2)
+    dotenv (1.0.2)
+    dotenv-rails (1.0.2)
+      dotenv (= 1.0.2)
     erubis (2.7.0)
-    execjs (2.0.2)
-    haml (4.0.5)
+    execjs (2.2.2)
+    haml (4.1.0.beta.1)
       tilt
-    haml-rails (0.5.3)
+    haml-rails (0.6.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
+      html2haml (>= 1.0.1)
       railties (>= 4.0.1)
     hike (1.2.3)
-    i18n (0.6.9)
-    jbuilder (1.5.3)
-      activesupport (>= 3.0.0)
-      multi_json (>= 1.2.0)
-    jquery-rails (3.1.0)
+    hpricot (0.8.6)
+    html2haml (1.0.1)
+      erubis (~> 2.7.0)
+      haml (>= 4.0.0.rc.1)
+      hpricot (~> 0.8.6)
+      ruby_parser (~> 3.1.1)
+    i18n (0.7.0)
+    jbuilder (2.2.6)
+      activesupport (>= 3.0.0, < 5)
+      multi_json (~> 1.2)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (2.4.3)
     minitest (4.7.5)
-    multi_json (1.9.2)
+    multi_json (1.10.1)
     pg (0.17.1)
-    polyglot (0.3.4)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pg (0.17.1-x86-mingw32)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry (0.10.1-x86-mingw32)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
+      win32console (~> 1.3)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
-    puma (2.8.1)
+    puma (2.10.2)
       rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -93,8 +102,8 @@ GEM
       activesupport (= 4.0.12)
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.0.12)
-      sprockets-rails (~> 2.0.0)
-    rails_12factor (0.0.2)
+      sprockets-rails (~> 2.0)
+    rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.2)
@@ -104,39 +113,41 @@ GEM
       activesupport (= 4.0.12)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.2.0)
-    redcarpet (3.1.1)
-    rouge (1.3.3)
-    sass (3.2.18)
-    sass-rails (4.0.12)
+    rake (10.4.2)
+    redcarpet (3.2.2)
+    rouge (1.7.4)
+    ruby_parser (3.1.3)
+      sexp_processor (~> 4.1)
+    sass (3.4.9)
+    sass-rails (5.0.0)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
-      sprockets-rails (~> 2.0.0)
-    slop (3.5.0)
-    sprockets (2.11.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
+    sexp_processor (4.4.4)
+    slop (3.6.0)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
+      sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
-    thread_safe (0.3.1)
-      atomic (>= 1.1.7, < 2)
+    thread_safe (0.3.4)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.39)
-    uglifier (2.5.0)
+    tzinfo (0.3.42)
+    uglifier (2.6.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    win32console (1.3.2-x86-mingw32)
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   better_errors

From f9474fdd1f31de9d1844ff8ee7a51715563b2056 Mon Sep 17 00:00:00 2001
From: Eric Guo <eric.guo@sandisk.com>
Date: Sun, 21 Dec 2014 20:39:44 +0800
Subject: [PATCH 03/15] Extra .css in SCSS file is unnecessary. Rename
 toggle.css.scss to toggle.scss.

---
 app/assets/stylesheets/{toggle.css.scss => toggle.scss} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/assets/stylesheets/{toggle.css.scss => toggle.scss} (100%)

diff --git a/app/assets/stylesheets/toggle.css.scss b/app/assets/stylesheets/toggle.scss
similarity index 100%
rename from app/assets/stylesheets/toggle.css.scss
rename to app/assets/stylesheets/toggle.scss

From d242041a56f40f603ddf612b5cc96475d7d78834 Mon Sep 17 00:00:00 2001
From: Eric Guo <eric.guo@sandisk.com>
Date: Sun, 21 Dec 2014 21:14:52 +0800
Subject: [PATCH 04/15] after running rake rails:update

---
 config/application.rb              | 2 +-
 config/boot.rb                     | 2 +-
 config/environments/development.rb | 3 +++
 config/environments/test.rb        | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 8c9d90f..9082d4d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -4,7 +4,7 @@
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env)
+Bundler.require(*Rails.groups)
 
 module EmberTutorial
   class Application < Rails::Application
diff --git a/config/boot.rb b/config/boot.rb
index 3596736..5e5f0c1 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,4 +1,4 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 071faea..7f6f571 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -26,4 +26,7 @@
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
   config.assets.debug = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 11e60ae..157bcc1 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -33,4 +33,7 @@
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end

From 0be9b83e7e2c2514d68883e2e592394c98799b81 Mon Sep 17 00:00:00 2001
From: Eric Guo <eric.guo@sandisk.com>
Date: Sun, 21 Dec 2014 21:18:19 +0800
Subject: [PATCH 05/15] New sublime project file

---
 ember-tutorial.sublime-project | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 ember-tutorial.sublime-project

diff --git a/ember-tutorial.sublime-project b/ember-tutorial.sublime-project
new file mode 100644
index 0000000..c340217
--- /dev/null
+++ b/ember-tutorial.sublime-project
@@ -0,0 +1,15 @@
+{
+	"folders":
+	[
+		{
+			"path": ".",
+			"folder_exclude_patterns": [".bundle",".idea","tmp","log","public/assets"],
+			"file_exclude_patterns": ["*.sublime-workspace","*.sqlite3"]
+		}
+	],
+  "settings":
+  {
+   "translate_tabs_to_spaces": true,
+   "tab_size": 2
+  }
+}

From b206db30e50dc5aa145d4d017db1f20e334d5ae3 Mon Sep 17 00:00:00 2001
From: Eric Guo <eric.guo@sandisk.com>
Date: Sun, 21 Dec 2014 21:35:01 +0800
Subject: [PATCH 06/15] Need username and password if running in windows in
 postgresql.

---
 config/database.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/database.yml b/config/database.yml
index 62241cd..1827b9e 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -3,6 +3,10 @@ development:
   encoding: unicode
   database: ember-tutorial_development
   host: localhost
+<% if Gem.win_platform? %>
+  username: ember-tutorial_development
+  password: only_need_in_windows
+<% end %>
 
 test:
   adapter: postgresql

From 0aef1df759356979d7fc3fd410a38141e0bf109d Mon Sep 17 00:00:00 2001
From: Eric Guo <eric.guo@sandisk.com>
Date: Sun, 21 Dec 2014 22:16:55 +0800
Subject: [PATCH 07/15] ignore the sublime workspace files

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index af87fb2..4b8c7e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@
 
 .ruby-version
 .ruby-gemset
+
+*.sublime-workspace

From 10eab9dc2aefc6f35c5e659f1090dd102512d06d Mon Sep 17 00:00:00 2001
From: Eric Guo <eric.guo@sandisk.com>
Date: Mon, 22 Dec 2014 22:12:27 +0800
Subject: [PATCH 08/15] make js server quiet

---
 Gemfile      | 1 +
 Gemfile.lock | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8109316..acceafd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,6 +21,7 @@ group :test, :development do
 end
 
 group :development do
+  gem 'quiet_assets'
   gem 'better_errors'
   gem 'binding_of_caller'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 476c252..5f16b69 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -26,7 +26,7 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     arel (4.0.2)
-    better_errors (2.0.0)
+    better_errors (2.1.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
@@ -92,6 +92,8 @@ GEM
       pry (>= 0.9.10)
     puma (2.10.2)
       rack (>= 1.1, < 2.0)
+    quiet_assets (1.1.0)
+      railties (>= 3.1, < 5.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -106,7 +108,7 @@ GEM
     rails_12factor (0.0.3)
       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.0.12)
       actionpack (= 4.0.12)
@@ -115,7 +117,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
     redcarpet (3.2.2)
-    rouge (1.7.4)
+    rouge (1.7.7)
     ruby_parser (3.1.3)
       sexp_processor (~> 4.1)
     sass (3.4.9)
@@ -161,6 +163,7 @@ DEPENDENCIES
   pg
   pry-rails
   puma
+  quiet_assets
   rails (= 4.0.12)
   rails_12factor
   redcarpet

From a2c55a31c314f24141d8dc4a96b903602e9b76b9 Mon Sep 17 00:00:00 2001
From: Eric Guo <eric.guo@sandisk.com>
Date: Sat, 24 Jan 2015 11:36:50 +0800
Subject: [PATCH 09/15] upgrade to rails 4.0.13

---
 Gemfile      |  2 +-
 Gemfile.lock | 82 +++++++++++++++++++++++++++-------------------------
 2 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/Gemfile b/Gemfile
index acceafd..e39b590 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '4.0.12'
+gem 'rails', '4.0.13'
 
 gem 'coffee-rails'
 gem 'decent_exposure'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5f16b69..cf0c852 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,32 +1,32 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.12)
-      actionpack (= 4.0.12)
+    actionmailer (4.0.13)
+      actionpack (= 4.0.13)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.12)
-      activesupport (= 4.0.12)
+    actionpack (4.0.13)
+      activesupport (= 4.0.13)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.12)
-      activesupport (= 4.0.12)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
       builder (~> 3.1.0)
-    activerecord (4.0.12)
-      activemodel (= 4.0.12)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.12)
+      activesupport (= 4.0.13)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.12)
+    activesupport (4.0.13)
       i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     arel (4.0.2)
-    better_errors (2.1.0)
+    better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
@@ -48,21 +48,20 @@ GEM
       dotenv (= 1.0.2)
     erubis (2.7.0)
     execjs (2.2.2)
-    haml (4.1.0.beta.1)
+    haml (4.0.6)
       tilt
-    haml-rails (0.6.0)
+    haml-rails (0.7.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
     hike (1.2.3)
-    hpricot (0.8.6)
-    html2haml (1.0.1)
+    html2haml (2.0.0)
       erubis (~> 2.7.0)
-      haml (>= 4.0.0.rc.1)
-      hpricot (~> 0.8.6)
-      ruby_parser (~> 3.1.1)
+      haml (~> 4.0.0)
+      nokogiri (~> 1.6.0)
+      ruby_parser (~> 3.5)
     i18n (0.7.0)
     jbuilder (2.2.6)
       activesupport (>= 3.0.0, < 5)
@@ -70,15 +69,20 @@ GEM
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.4.3)
+    mini_portile (0.6.2)
     minitest (4.7.5)
     multi_json (1.10.1)
-    pg (0.17.1)
-    pg (0.17.1-x86-mingw32)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    nokogiri (1.6.6.2-x86-mingw32)
+      mini_portile (~> 0.6.0)
+    pg (0.18.1)
+    pg (0.18.1-x86-mingw32)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -90,51 +94,51 @@ GEM
       win32console (~> 1.3)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
-    puma (2.10.2)
+    puma (2.11.0)
       rack (>= 1.1, < 2.0)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
     rack (1.5.2)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.0.12)
-      actionmailer (= 4.0.12)
-      actionpack (= 4.0.12)
-      activerecord (= 4.0.12)
-      activesupport (= 4.0.12)
+    rails (4.0.13)
+      actionmailer (= 4.0.13)
+      actionpack (= 4.0.13)
+      activerecord (= 4.0.13)
+      activesupport (= 4.0.13)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.12)
+      railties (= 4.0.13)
       sprockets-rails (~> 2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.3)
     rails_stdout_logging (0.0.3)
-    railties (4.0.12)
-      actionpack (= 4.0.12)
-      activesupport (= 4.0.12)
+    railties (4.0.13)
+      actionpack (= 4.0.13)
+      activesupport (= 4.0.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
     redcarpet (3.2.2)
     rouge (1.7.7)
-    ruby_parser (3.1.3)
+    ruby_parser (3.6.4)
       sexp_processor (~> 4.1)
-    sass (3.4.9)
-    sass-rails (5.0.0)
+    sass (3.4.10)
+    sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
-    sexp_processor (4.4.4)
+    sexp_processor (4.4.5)
     slop (3.6.0)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -142,7 +146,7 @@ GEM
     thread_safe (0.3.4)
     tilt (1.4.1)
     tzinfo (0.3.42)
-    uglifier (2.6.0)
+    uglifier (2.7.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     win32console (1.3.2-x86-mingw32)
@@ -164,7 +168,7 @@ DEPENDENCIES
   pry-rails
   puma
   quiet_assets
-  rails (= 4.0.12)
+  rails (= 4.0.13)
   rails_12factor
   redcarpet
   rouge

From 6a1dc76ba62e564672bd1faf7b372f4b33a62868 Mon Sep 17 00:00:00 2001
From: Eric Guo <eric.guo@sandisk.com>
Date: Mon, 1 Jun 2015 14:26:39 +0800
Subject: [PATCH 10/15] upgrade gems

---
 Gemfile.lock | 67 ++++++++++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index cf0c852..34336ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,7 +18,7 @@ GEM
       activerecord-deprecated_finders (~> 1.0.2)
       activesupport (= 4.0.13)
       arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
+    activerecord-deprecated_finders (1.0.4)
     activesupport (4.0.13)
       i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
@@ -37,52 +37,51 @@ GEM
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.9.1.1)
     debug_inspector (0.0.2)
     decent_exposure (2.3.2)
-    dotenv (1.0.2)
-    dotenv-rails (1.0.2)
-      dotenv (= 1.0.2)
+    dotenv (2.0.1)
+    dotenv-rails (2.0.1)
+      dotenv (= 2.0.1)
     erubis (2.7.0)
-    execjs (2.2.2)
+    execjs (2.5.2)
     haml (4.0.6)
       tilt
-    haml-rails (0.7.0)
+    haml-rails (0.9.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
-      haml (>= 3.1, < 5.0)
+      haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    hike (1.2.3)
     html2haml (2.0.0)
       erubis (~> 2.7.0)
       haml (~> 4.0.0)
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
     i18n (0.7.0)
-    jbuilder (2.2.6)
+    jbuilder (2.3.0)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.2)
+    json (1.8.3)
     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_portile (0.6.2)
     minitest (4.7.5)
-    multi_json (1.10.1)
+    multi_json (1.11.1)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     nokogiri (1.6.6.2-x86-mingw32)
       mini_portile (~> 0.6.0)
-    pg (0.18.1)
-    pg (0.18.1-x86-mingw32)
+    pg (0.18.2)
+    pg (0.18.2-x86-mingw32)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -92,13 +91,13 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
       win32console (~> 1.3)
-    pry-rails (0.3.2)
+    pry-rails (0.3.4)
       pry (>= 0.9.10)
-    puma (2.11.0)
+    puma (2.11.3)
       rack (>= 1.1, < 2.0)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.5.2)
+    rack (1.5.3)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.0.13)
@@ -112,7 +111,7 @@ GEM
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
-    rails_serve_static_assets (0.0.3)
+    rails_serve_static_assets (0.0.4)
     rails_stdout_logging (0.0.3)
     railties (4.0.13)
       actionpack (= 4.0.13)
@@ -120,33 +119,30 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    redcarpet (3.2.2)
-    rouge (1.7.7)
-    ruby_parser (3.6.4)
+    redcarpet (3.3.1)
+    rouge (1.9.0)
+    ruby_parser (3.7.0)
       sexp_processor (~> 4.1)
-    sass (3.4.10)
-    sass-rails (5.0.1)
+    sass (3.4.14)
+    sass-rails (5.0.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
-    sexp_processor (4.4.5)
+    sexp_processor (4.6.0)
     slop (3.6.0)
-    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)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
-    tzinfo (0.3.42)
-    uglifier (2.7.0)
+    tzinfo (0.3.44)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     win32console (1.3.2-x86-mingw32)
@@ -174,3 +170,6 @@ DEPENDENCIES
   rouge
   sass-rails
   uglifier
+
+BUNDLED WITH
+   1.10.3

From 9afdd40a812c5b8315b1504c012a9534de59df69 Mon Sep 17 00:00:00 2001
From: Eric Guo <eric.guo@sandisk.com>
Date: Sat, 12 Sep 2015 17:18:25 +0800
Subject: [PATCH 11/15] Enable running ruby 2.2 need nokogiri rc version

---
 Gemfile      |  2 ++
 Gemfile.lock | 61 ++++++++++++++++++++++++++--------------------------
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/Gemfile b/Gemfile
index e39b590..e8e55a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,3 +25,5 @@ group :development do
   gem 'better_errors'
   gem 'binding_of_caller'
 end
+
+gem 'nokogiri', '~> 1.6.7.rc3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 34336ba..bd0247a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -43,12 +43,13 @@ GEM
     coffee-script-source (1.9.1.1)
     debug_inspector (0.0.2)
     decent_exposure (2.3.2)
-    dotenv (2.0.1)
-    dotenv-rails (2.0.1)
-      dotenv (= 2.0.1)
+    dotenv (2.0.2)
+    dotenv-rails (2.0.2)
+      dotenv (= 2.0.2)
+      railties (~> 4.0)
     erubis (2.7.0)
-    execjs (2.5.2)
-    haml (4.0.6)
+    execjs (2.6.0)
+    haml (4.0.7)
       tilt
     haml-rails (0.9.0)
       actionpack (>= 4.0.1)
@@ -62,10 +63,10 @@ GEM
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
     i18n (0.7.0)
-    jbuilder (2.3.0)
+    jbuilder (2.3.1)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
-    jquery-rails (3.1.2)
+    jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
@@ -73,15 +74,15 @@ GEM
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.6.1)
-    mini_portile (0.6.2)
+    mini_portile (0.7.0.rc4)
     minitest (4.7.5)
-    multi_json (1.11.1)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    nokogiri (1.6.6.2-x86-mingw32)
-      mini_portile (~> 0.6.0)
-    pg (0.18.2)
-    pg (0.18.2-x86-mingw32)
+    multi_json (1.11.2)
+    nokogiri (1.6.7.rc3)
+      mini_portile (~> 0.7.0.rc4)
+    nokogiri (1.6.7.rc3-x86-mingw32)
+      mini_portile (~> 0.7.0.rc4)
+    pg (0.18.3)
+    pg (0.18.3-x86-mingw32)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -93,11 +94,10 @@ GEM
       win32console (~> 1.3)
     pry-rails (0.3.4)
       pry (>= 0.9.10)
-    puma (2.11.3)
-      rack (>= 1.1, < 2.0)
+    puma (2.13.4)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.5.3)
+    rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.0.13)
@@ -112,37 +112,37 @@ GEM
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.4)
-    rails_stdout_logging (0.0.3)
+    rails_stdout_logging (0.0.4)
     railties (4.0.13)
       actionpack (= 4.0.13)
       activesupport (= 4.0.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    redcarpet (3.3.1)
-    rouge (1.9.0)
-    ruby_parser (3.7.0)
+    redcarpet (3.3.2)
+    rouge (1.10.1)
+    ruby_parser (3.7.1)
       sexp_processor (~> 4.1)
-    sass (3.4.14)
-    sass-rails (5.0.3)
+    sass (3.4.18)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
+      tilt (>= 1.1, < 3)
     sexp_processor (4.6.0)
     slop (3.6.0)
-    sprockets (3.2.0)
+    sprockets (3.3.4)
       rack (~> 1.0)
-    sprockets-rails (2.3.1)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
+    tilt (2.0.1)
     tzinfo (0.3.44)
-    uglifier (2.7.1)
+    uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     win32console (1.3.2-x86-mingw32)
@@ -160,6 +160,7 @@ DEPENDENCIES
   haml-rails
   jbuilder
   jquery-rails
+  nokogiri (~> 1.6.7.rc3)
   pg
   pry-rails
   puma
@@ -172,4 +173,4 @@ DEPENDENCIES
   uglifier
 
 BUNDLED WITH
-   1.10.3
+   1.10.6

From 063b5f04262e5407497e07024f77879981b113f3 Mon Sep 17 00:00:00 2001
From: Eric Guo <eric.guo@sandisk.com>
Date: Mon, 23 Nov 2015 22:53:26 +0800
Subject: [PATCH 12/15] upgrade to using Rails 4.1.14

---
 Gemfile      |   4 +-
 Gemfile.lock | 113 +++++++++++++++++++++++++--------------------------
 2 files changed, 58 insertions(+), 59 deletions(-)

diff --git a/Gemfile b/Gemfile
index e8e55a3..be140a9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '4.0.13'
+gem 'rails', '~> 4.1.14'
 
 gem 'coffee-rails'
 gem 'decent_exposure'
@@ -26,4 +26,4 @@ group :development do
   gem 'binding_of_caller'
 end
 
-gem 'nokogiri', '~> 1.6.7.rc3'
+gem 'nokogiri', '~> 1.6.7.rc4'
diff --git a/Gemfile.lock b/Gemfile.lock
index bd0247a..3c6b723 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,38 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.13)
-      actionpack (= 4.0.13)
+    actionmailer (4.1.14)
+      actionpack (= 4.1.14)
+      actionview (= 4.1.14)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionpack (4.1.14)
+      actionview (= 4.1.14)
+      activesupport (= 4.1.14)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-    activerecord (4.0.13)
-      activemodel (= 4.0.13)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.13)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.4)
-    activesupport (4.0.13)
+    actionview (4.1.14)
+      activesupport (= 4.1.14)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.14)
+      activesupport (= 4.1.14)
+      builder (~> 3.1)
+    activerecord (4.1.14)
+      activemodel (= 4.1.14)
+      activesupport (= 4.1.14)
+      arel (~> 5.0.0)
+    activesupport (4.1.14)
       i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.2)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
     better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    builder (3.1.4)
+    builder (3.2.2)
     coderay (1.1.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
@@ -40,7 +42,7 @@ GEM
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
+    coffee-script-source (1.10.0)
     debug_inspector (0.0.2)
     decent_exposure (2.3.2)
     dotenv (2.0.2)
@@ -63,7 +65,7 @@ GEM
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
     i18n (0.7.0)
-    jbuilder (2.3.1)
+    jbuilder (2.3.2)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jquery-rails (3.1.4)
@@ -73,57 +75,54 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.6.1)
-    mini_portile (0.7.0.rc4)
-    minitest (4.7.5)
+    mime-types (2.99)
+    mini_portile2 (2.0.0.rc2)
+    minitest (5.8.3)
     multi_json (1.11.2)
-    nokogiri (1.6.7.rc3)
-      mini_portile (~> 0.7.0.rc4)
-    nokogiri (1.6.7.rc3-x86-mingw32)
-      mini_portile (~> 0.7.0.rc4)
-    pg (0.18.3)
-    pg (0.18.3-x86-mingw32)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry (0.10.1-x86-mingw32)
+    nokogiri (1.6.7.rc4)
+      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.7.rc4-x86-mingw32)
+      mini_portile2 (~> 2.0.0.rc2)
+    pg (0.18.4)
+    pg (0.18.4-x86-mingw32)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-      win32console (~> 1.3)
     pry-rails (0.3.4)
       pry (>= 0.9.10)
-    puma (2.13.4)
+    puma (2.15.3)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
     rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.0.13)
-      actionmailer (= 4.0.13)
-      actionpack (= 4.0.13)
-      activerecord (= 4.0.13)
-      activesupport (= 4.0.13)
+    rails (4.1.14)
+      actionmailer (= 4.1.14)
+      actionpack (= 4.1.14)
+      actionview (= 4.1.14)
+      activemodel (= 4.1.14)
+      activerecord (= 4.1.14)
+      activesupport (= 4.1.14)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.13)
+      railties (= 4.1.14)
       sprockets-rails (~> 2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.4)
     rails_stdout_logging (0.0.4)
-    railties (4.0.13)
-      actionpack (= 4.0.13)
-      activesupport (= 4.0.13)
+    railties (4.1.14)
+      actionpack (= 4.1.14)
+      activesupport (= 4.1.14)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    redcarpet (3.3.2)
+    redcarpet (3.3.3)
     rouge (1.10.1)
-    ruby_parser (3.7.1)
+    ruby_parser (3.7.2)
       sexp_processor (~> 4.1)
-    sass (3.4.18)
+    sass (3.4.19)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -132,8 +131,8 @@ GEM
       tilt (>= 1.1, < 3)
     sexp_processor (4.6.0)
     slop (3.6.0)
-    sprockets (3.3.4)
-      rack (~> 1.0)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -141,11 +140,11 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.1)
-    tzinfo (0.3.44)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    win32console (1.3.2-x86-mingw32)
 
 PLATFORMS
   ruby
@@ -160,12 +159,12 @@ DEPENDENCIES
   haml-rails
   jbuilder
   jquery-rails
-  nokogiri (~> 1.6.7.rc3)
+  nokogiri (~> 1.6.7.rc4)
   pg
   pry-rails
   puma
   quiet_assets
-  rails (= 4.0.13)
+  rails (~> 4.1.14)
   rails_12factor
   redcarpet
   rouge

From 536c7b50929449e61eac1b1f3ab76e769fbaec67 Mon Sep 17 00:00:00 2001
From: Eric Guo <eric.guo@sandisk.com>
Date: Sun, 20 Mar 2016 23:17:31 +0800
Subject: [PATCH 13/15] upgrade to Rails 4.1.15

---
 Gemfile      |   5 ++-
 Gemfile.lock | 108 ++++++++++++++++++++++++++-------------------------
 2 files changed, 59 insertions(+), 54 deletions(-)

diff --git a/Gemfile b/Gemfile
index be140a9..8d623da 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.1.14'
+gem 'rails', '~> 4.1.15'
 
 gem 'coffee-rails'
 gem 'decent_exposure'
@@ -26,4 +26,5 @@ group :development do
   gem 'binding_of_caller'
 end
 
-gem 'nokogiri', '~> 1.6.7.rc4'
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
diff --git a/Gemfile.lock b/Gemfile.lock
index 3c6b723..67c7343 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,27 +1,27 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.14)
-      actionpack (= 4.1.14)
-      actionview (= 4.1.14)
+    actionmailer (4.1.15)
+      actionpack (= 4.1.15)
+      actionview (= 4.1.15)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.14)
-      actionview (= 4.1.14)
-      activesupport (= 4.1.14)
+    actionpack (4.1.15)
+      actionview (= 4.1.15)
+      activesupport (= 4.1.15)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.14)
-      activesupport (= 4.1.14)
+    actionview (4.1.15)
+      activesupport (= 4.1.15)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.14)
-      activesupport (= 4.1.14)
+    activemodel (4.1.15)
+      activesupport (= 4.1.15)
       builder (~> 3.1)
-    activerecord (4.1.14)
-      activemodel (= 4.1.14)
-      activesupport (= 4.1.14)
+    activerecord (4.1.15)
+      activemodel (= 4.1.15)
+      activesupport (= 4.1.15)
       arel (~> 5.0.0)
-    activesupport (4.1.14)
+    activesupport (4.1.15)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -35,20 +35,21 @@ GEM
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
-    coderay (1.1.0)
-    coffee-rails (4.1.0)
+    coderay (1.1.1)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
+    concurrent-ruby (1.0.1)
     debug_inspector (0.0.2)
-    decent_exposure (2.3.2)
-    dotenv (2.0.2)
-    dotenv-rails (2.0.2)
-      dotenv (= 2.0.2)
-      railties (~> 4.0)
+    decent_exposure (2.3.3)
+    dotenv (2.1.0)
+    dotenv-rails (2.1.0)
+      dotenv (= 2.1.0)
+      railties (>= 4.0, < 5.1)
     erubis (2.7.0)
     execjs (2.6.0)
     haml (4.0.7)
@@ -65,8 +66,8 @@ GEM
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
     i18n (0.7.0)
-    jbuilder (2.3.2)
-      activesupport (>= 3.0.0, < 5)
+    jbuilder (2.4.1)
+      activesupport (>= 3.0.0, < 5.1)
       multi_json (~> 1.2)
     jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
@@ -75,13 +76,13 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.99)
-    mini_portile2 (2.0.0.rc2)
-    minitest (5.8.3)
+    mime-types (2.99.1)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
     multi_json (1.11.2)
-    nokogiri (1.6.7.rc4)
+    nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    nokogiri (1.6.7.rc4-x86-mingw32)
+    nokogiri (1.6.7.2-x86-mingw32)
       mini_portile2 (~> 2.0.0.rc2)
     pg (0.18.4)
     pg (0.18.4-x86-mingw32)
@@ -91,47 +92,48 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.4)
       pry (>= 0.9.10)
-    puma (2.15.3)
+    puma (3.1.1)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
     rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.14)
-      actionmailer (= 4.1.14)
-      actionpack (= 4.1.14)
-      actionview (= 4.1.14)
-      activemodel (= 4.1.14)
-      activerecord (= 4.1.14)
-      activesupport (= 4.1.14)
+    rails (4.1.15)
+      actionmailer (= 4.1.15)
+      actionpack (= 4.1.15)
+      actionview (= 4.1.15)
+      activemodel (= 4.1.15)
+      activerecord (= 4.1.15)
+      activesupport (= 4.1.15)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.14)
+      railties (= 4.1.15)
       sprockets-rails (~> 2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
-    rails_serve_static_assets (0.0.4)
+    rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.4)
-    railties (4.1.14)
-      actionpack (= 4.1.14)
-      activesupport (= 4.1.14)
+    railties (4.1.15)
+      actionpack (= 4.1.15)
+      activesupport (= 4.1.15)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    redcarpet (3.3.3)
+    rake (11.1.1)
+    redcarpet (3.3.4)
     rouge (1.10.1)
-    ruby_parser (3.7.2)
+    ruby_parser (3.8.1)
       sexp_processor (~> 4.1)
-    sass (3.4.19)
+    sass (3.4.21)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sexp_processor (4.6.0)
+    sexp_processor (4.7.0)
     slop (3.6.0)
-    sprockets (3.4.0)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
@@ -139,9 +141,11 @@ GEM
       sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.1)
+    tilt (2.0.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    tzinfo-data (1.2016.2)
+      tzinfo (>= 1.0.0)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -159,17 +163,17 @@ DEPENDENCIES
   haml-rails
   jbuilder
   jquery-rails
-  nokogiri (~> 1.6.7.rc4)
   pg
   pry-rails
   puma
   quiet_assets
-  rails (~> 4.1.14)
+  rails (~> 4.1.15)
   rails_12factor
   redcarpet
   rouge
   sass-rails
+  tzinfo-data
   uglifier
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

From 59d1103f660ffad400d1e79a4bac759462149b13 Mon Sep 17 00:00:00 2001
From: Eric Guo <eric.guo@sandisk.com>
Date: Sun, 20 Mar 2016 23:20:45 +0800
Subject: [PATCH 14/15] No need password also in Windows for pg.

---
 config/database.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config/database.yml b/config/database.yml
index 1827b9e..62241cd 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -3,10 +3,6 @@ development:
   encoding: unicode
   database: ember-tutorial_development
   host: localhost
-<% if Gem.win_platform? %>
-  username: ember-tutorial_development
-  password: only_need_in_windows
-<% end %>
 
 test:
   adapter: postgresql

From ab0b370f02b2ce34fea273b9c433925a0a4591ce Mon Sep 17 00:00:00 2001
From: Eric Guo <eric.guo@sandisk.com>
Date: Sun, 20 Mar 2016 23:26:46 +0800
Subject: [PATCH 15/15] After running rake rails:update

---
 config/environment.rb                     |  2 +-
 config/environments/development.rb        |  9 +++++++--
 config/environments/production.rb         | 20 +++++++++-----------
 config/environments/test.rb               |  4 ++--
 config/initializers/assets.rb             |  8 ++++++++
 config/initializers/cookies_serializer.rb |  3 +++
 config/initializers/mime_types.rb         |  1 -
 config/initializers/secret_token.rb       | 12 ------------
 config/initializers/session_store.rb      |  2 +-
 config/routes.rb                          |  4 +++-
 config/secrets.yml                        | 22 ++++++++++++++++++++++
 11 files changed, 56 insertions(+), 31 deletions(-)
 create mode 100644 config/initializers/assets.rb
 create mode 100644 config/initializers/cookies_serializer.rb
 delete mode 100644 config/initializers/secret_token.rb
 create mode 100644 config/secrets.yml

diff --git a/config/environment.rb b/config/environment.rb
index d7030ee..ee8d90d 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -2,4 +2,4 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the Rails application.
-EmberTutorial::Application.initialize!
+Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 7f6f571..ddf0e90 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,4 +1,4 @@
-EmberTutorial::Application.configure do
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
@@ -19,7 +19,7 @@
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Raise an error on page load if there are pending migrations
+  # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
   # Debug mode disables concatenation and preprocessing of assets.
@@ -27,6 +27,11 @@
   # number of complex assets.
   config.assets.debug = true
 
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index adceca9..b93a877 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,11 +1,11 @@
-EmberTutorial::Application.configure do
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # Code is not reloaded between requests.
   config.cache_classes = true
 
   # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both thread web servers
+  # your application in memory, allowing both threaded web servers
   # and those relying on copy on write to perform better.
   # Rake tasks automatically ignore this option for performance.
   config.eager_load = true
@@ -20,20 +20,19 @@
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = true
+  config.serve_static_assets = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = true
+  config.assets.compile = false
 
   # Generate digests for assets URLs.
   config.assets.digest = true
 
-  # Version of your assets, change this if you want to expire all your assets.
-  config.assets.version = '1.0'
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
   # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
@@ -57,16 +56,12 @@
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = "http://assets.example.com"
 
-  # Precompile additional assets.
-  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-  # config.assets.precompile += %w( search.js )
-
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found).
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
   # Send deprecation notices to registered listeners.
@@ -77,4 +72,7 @@
 
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 157bcc1..053f5b6 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,4 +1,4 @@
-EmberTutorial::Application.configure do
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
@@ -14,7 +14,7 @@
 
   # Configure static asset server for tests with Cache-Control for performance.
   config.serve_static_assets  = true
-  config.static_cache_control = "public, max-age=3600"
+  config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
new file mode 100644
index 0000000..d2f4ec3
--- /dev/null
+++ b/config/initializers/assets.rb
@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
new file mode 100644
index 0000000..719a617
--- /dev/null
+++ b/config/initializers/cookies_serializer.rb
@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.action_dispatch.cookies_serializer = :marshal
\ No newline at end of file
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 72aca7e..dc18996 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -2,4 +2,3 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
deleted file mode 100644
index bc99110..0000000
--- a/config/initializers/secret_token.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key is used for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-# You can use `rake secret` to generate a secure secret key.
-
-# Make sure your secret_key_base is kept private
-# if you're sharing your code publicly.
-EmberTutorial::Application.config.secret_key_base = '9e2f68bdbbeb5f278dc6bbdda66e6194133fd22d7c9f86d28ff3e4ee874d4c5d3d97e011cdceeea731e8a617ca977ee8288677be2b687a1002d70c1b93c912b4'
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 468ba7d..2cae6a6 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-EmberTutorial::Application.config.session_store :cookie_store, key: '_ember-tutorial_session'
+Rails.application.config.session_store :cookie_store, key: '_ember-tutorial_session'
diff --git a/config/routes.rb b/config/routes.rb
index b56723c..94b62e0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,6 @@
-EmberTutorial::Application.routes.draw do
+Rails.application.routes.draw do
+  # The priority is based upon order of creation: first created -> highest priority.
+  # See how all your routes lay out with "rake routes".
   root to: 'home#index'
 
   get 'chapters', to: 'home#chapters'
diff --git a/config/secrets.yml b/config/secrets.yml
new file mode 100644
index 0000000..0be10d9
--- /dev/null
+++ b/config/secrets.yml
@@ -0,0 +1,22 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development:
+  secret_key_base: 9e2f68bdbbeb5f278dc6bbdda66e6194133fd22d7c9f86d28ff3e4ee874d4c5d3d97e011cdceeea731e8a617ca977ee8288677be2b687a1002d70c1b93c912b4
+
+test:
+  secret_key_base: dcf16739be080fd10926696764869abe2b72ae122879d2a485594f8aeb45a9ba420796cfef8ef1c62ddb2849936173052cad716f8776ca6076568926fc94a74c
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>