From 2e6af399a8e0e1f137e12a439a713d664046f957 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 21 Dec 2015 16:39:15 +1100
Subject: [PATCH] update rails, remove spork

---
 Gemfile      | 23 +++++++++++------
 Gemfile.lock | 73 ++++++++++++++++++++++------------------------------
 2 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/Gemfile b/Gemfile
index ad3ad4699e8..eb8b8bc0307 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,15 +15,23 @@ else
   # Rails 5 is going to ship with Action Cable, we have no use for it as
   # we already ship MessageBus, AC introduces dependencies on Event Machine,
   # Celluloid and Faye Web Sockets.
-  gem 'activesupport', '~> 4.2'
-  gem 'actionpack'
-  gem 'activerecord'
-  gem 'actionmailer'
-  gem 'activejob'
-  gem 'railties'
+  #
+  # Note this means upgrading Rails is more annoying, to do so, comment out the
+  # explicit dependencies, and add gem 'rails', bundle update rails and then
+  # comment back the explicit dependencies. Leaving this in a comment till we
+  # upgrade to Rails 5
+  #
+  # gem 'activesupport'
+  # gem 'actionpack'
+  # gem 'activerecord'
+  # gem 'actionmailer'
+  # gem 'activejob'
+  # gem 'railties'
+  # gem 'sprockets-rails'
+  gem 'rails', '~> 4.2'
+
   gem 'rails-observers'
   gem 'seed-fu', '~> 2.3.5'
-  gem 'sprockets-rails'
 end
 
 gem 'mail'
@@ -130,7 +138,6 @@ group :test, :development do
   gem 'rspec-given'
   gem 'rspec-html-matchers'
   gem 'pry-nav'
-  gem 'spork-rails'
   gem 'byebug', require: ENV['RM_INFO'].nil?
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 1e6ac202911..3151083c979 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,38 +1,38 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
+    actionmailer (4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.4)
-      actionview (= 4.2.4)
-      activesupport (= 4.2.4)
+    actionpack (4.2.5)
+      actionview (= 4.2.5)
+      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)
-      activesupport (= 4.2.4)
+    actionview (4.2.5)
+      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)
     active_model_serializers (0.8.3)
       activemodel (>= 3.0)
-    activejob (4.2.4)
-      activesupport (= 4.2.4)
+    activejob (4.2.5)
+      activesupport (= 4.2.5)
       globalid (>= 0.3.0)
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
+    activerecord (4.2.5)
+      activemodel (= 4.2.5)
+      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)
@@ -198,7 +198,7 @@ GEM
       redis
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.6.2)
+    mime-types (2.99)
     mini_portile2 (2.0.0)
     minitest (5.8.3)
     mocha (1.1.0)
@@ -277,16 +277,16 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.4)
-      actionmailer (= 4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
-      activemodel (= 4.2.4)
-      activerecord (= 4.2.4)
-      activesupport (= 4.2.4)
+    rails (4.2.5)
+      actionmailer (= 4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
+      activemodel (= 4.2.5)
+      activerecord (= 4.2.5)
+      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)
@@ -299,9 +299,9 @@ GEM
     rails-observers (0.1.2)
       activemodel (~> 4.0)
     rails_multisite (1.0.3)
-    railties (4.2.4)
-      actionpack (= 4.2.4)
-      activesupport (= 4.2.4)
+    railties (4.2.5)
+      actionpack (= 4.2.5)
+      activesupport (= 4.2.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.15.0)
@@ -396,10 +396,6 @@ GEM
       tilt (>= 1.3, < 3)
     slop (3.6.0)
     sorcerer (1.0.2)
-    spork (1.0.0rc4)
-    spork-rails (4.0.0)
-      rails (>= 3.0.0, < 5)
-      spork (>= 1.0rc0)
     sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -441,12 +437,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionmailer
-  actionpack
   active_model_serializers (~> 0.8.3)
-  activejob
-  activerecord
-  activesupport (~> 4.2)
   annotate
   aws-sdk
   babel-transpiler
@@ -504,9 +495,9 @@ DEPENDENCIES
   r2 (~> 0.2.5)
   rack-mini-profiler
   rack-protection
+  rails (~> 4.2)
   rails-observers
   rails_multisite
-  railties
   rake
   rb-fsevent
   rb-inotify (~> 0.9)
@@ -531,8 +522,6 @@ DEPENDENCIES
   simple-rss
   simplecov
   sinatra
-  spork-rails
-  sprockets-rails
   stackprof
   therubyracer
   thin