Merge pull request #208 from jasnow/master

Upgraded Rails to 4.2.5 plus rebuilt Gemfile.lock file.

Gemfile

@@ -1,12 +1,12 @@
 source 'https://rubygems.org'
 
 #don't upgrade
-gem 'rails', '4.2.4'
+gem 'rails', '4.2.5'
 
 ruby '2.2.3'
 
 # Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
+# gem 'rails', github: 'rails/rails'
 
 gem 'sqlite3'
 gem 'foreman'

Gemfile.lock

@@ -1,36 +1,36 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.4)
+    actionmailer (4.2.5)
-      actionpack (= 4.2.4)
+      actionpack (= 4.2.5)
-      actionview (= 4.2.4)
+      actionview (= 4.2.5)
-      activejob (= 4.2.4)
+      activejob (= 4.2.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.4)
+    actionpack (4.2.5)
-      actionview (= 4.2.4)
+      actionview (= 4.2.5)
-      activesupport (= 4.2.4)
+      activesupport (= 4.2.5)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.4)
+    actionview (4.2.5)
-      activesupport (= 4.2.4)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.4)
+    activejob (4.2.5)
-      activesupport (= 4.2.4)
+      activesupport (= 4.2.5)
       globalid (>= 0.3.0)
-    activemodel (4.2.4)
+    activemodel (4.2.5)
-      activesupport (= 4.2.4)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
-    activerecord (4.2.4)
+    activerecord (4.2.5)
-      activemodel (= 4.2.4)
+      activemodel (= 4.2.5)
-      activesupport (= 4.2.4)
+      activesupport (= 4.2.5)
       arel (~> 6.0)
-    activesupport (4.2.4)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -49,7 +49,7 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    brakeman (3.1.1)
+    brakeman (3.1.2)
       erubis (~> 2.6)
       fastercsv (~> 1.5)
       haml (>= 3.0, < 5.0)
@@ -57,6 +57,7 @@ GEM
       multi_json (~> 1.2)
       ruby2ruby (>= 2.1.1, < 2.3.0)
       ruby_parser (~> 3.7.0)
+      safe_yaml
       sass (~> 3.0)
       slim (>= 1.3.6, < 4.0)
       terminal-table (~> 1.4)
@@ -70,7 +71,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.6)
+    childprocess (0.5.8)
       ffi (~> 1.0, >= 1.0.11)
     cliver (0.3.2)
     coderay (1.1.0)
@@ -80,7 +81,7 @@ GEM
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
+    coffee-script-source (1.10.0)
     crack (0.3.1)
     cucumber (2.1.0)
       builder (>= 2.1.2)
@@ -92,7 +93,7 @@ GEM
     cucumber-core (1.3.0)
       gherkin3 (~> 3.1.0)
     daemons (1.2.3)
-    database_cleaner (1.5.0)
+    database_cleaner (1.5.1)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
@@ -112,7 +113,7 @@ GEM
       cucumber
       nokogiri
       trollop
-    gherkin3 (3.1.1)
+    gherkin3 (3.1.2)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     guard (2.13.0)
@@ -128,9 +129,10 @@ GEM
       brakeman (>= 2.1.1)
       guard (>= 2.0.0)
     guard-compat (1.2.1)
-    guard-livereload (2.4.0)
+    guard-livereload (2.5.1)
       em-websocket (~> 0.5)
       guard (~> 2.8)
+      guard-compat (~> 1.0)
       multi_json (~> 1.8)
     guard-rspec (4.3.1)
       guard (~> 2.1)
@@ -140,7 +142,7 @@ GEM
       guard-compat (~> 1.0)
     haml (4.0.7)
       tilt
-    highline (1.7.7)
+    highline (1.7.8)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
     jquery-fileupload-rails (0.4.6)
@@ -155,8 +157,8 @@ GEM
     kgio (2.10.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (3.16.14.11)
+    libv8 (3.16.14.13)
-    listen (3.0.3)
+    listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     loofah (2.0.3)
@@ -175,25 +177,25 @@ GEM
     method_source (0.8.2)
     mime-types (2.6.2)
     mini_portile (0.6.2)
-    minitest (5.8.1)
+    minitest (5.8.3)
     multi_json (1.11.2)
     multi_test (0.1.2)
     mysql2 (0.4.1)
     nenv (0.2.0)
-    nokogiri (1.6.6.2)
+    nokogiri (1.6.6.4)
       mini_portile (~> 0.6.0)
     notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    poltergeist (1.7.0)
+    poltergeist (1.8.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     powder (0.3.0)
       thor (>= 0.11.5)
-    power_assert (0.2.4)
+    power_assert (0.2.6)
-    pry (0.10.2)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -206,16 +208,16 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.4)
+    rails (4.2.5)
-      actionmailer (= 4.2.4)
+      actionmailer (= 4.2.5)
-      actionpack (= 4.2.4)
+      actionpack (= 4.2.5)
-      actionview (= 4.2.4)
+      actionview (= 4.2.5)
-      activejob (= 4.2.4)
+      activejob (= 4.2.5)
-      activemodel (= 4.2.4)
+      activemodel (= 4.2.5)
-      activerecord (= 4.2.4)
+      activerecord (= 4.2.5)
-      activesupport (= 4.2.4)
+      activesupport (= 4.2.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.4)
+      railties (= 4.2.5)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -225,9 +227,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    railties (4.2.4)
+    railties (4.2.5)
-      actionpack (= 4.2.4)
+      actionpack (= 4.2.5)
-      activesupport (= 4.2.4)
+      activesupport (= 4.2.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.15.0)
@@ -255,9 +257,10 @@ GEM
     ruby2ruby (2.2.0)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.7.1)
+    ruby_parser (3.7.2)
       sexp_processor (~> 4.1)
-    sass (3.4.18)
+    safe_yaml (1.0.4)
+    sass (3.4.19)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -282,16 +285,16 @@ GEM
       temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
-    sprockets (3.3.5)
+    sprockets (3.4.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.10)
+    sqlite3 (1.3.11)
     temple (0.7.6)
     terminal-table (1.5.2)
-    test-unit (3.1.4)
+    test-unit (3.1.5)
       power_assert
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
@@ -313,11 +316,11 @@ GEM
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    unicorn (4.9.0)
+    unicorn (5.0.1)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    websocket-driver (0.6.2)
+    websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     xpath (2.0.0)
@@ -354,7 +357,7 @@ DEPENDENCIES
   pry
   pry-rails
   rack-livereload
-  rails (= 4.2.4)
+  rails (= 4.2.5)
   rb-fsevent
   rspec-rails (= 2.14.2)
   sass-rails