From 5a68db91c8a2ae7d23b07a5c52b8b74d859a819f Mon Sep 17 00:00:00 2001
From: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Date: Sat, 15 Feb 2014 20:46:15 +0100
Subject: Added spring to the project

---
 Gemfile      | 4 ++++
 Gemfile.lock | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/Gemfile b/Gemfile
index 6a06df6fbe5..ba7f6a7f52a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -208,6 +208,10 @@ group :development, :test do
 
   gem 'spork', '~> 1.0rc'
   gem 'jasmine', '2.0.0.rc5'
+
+  gem "spring", '1.1.1'
+  gem "spring-commands-rspec", '1.0.1'
+  gem "spring-commands-spinach", '1.0.0'
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 2c99063726e..91d04e2ec70 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -470,6 +470,11 @@ GEM
       railties (>= 3)
       spinach (>= 0.4)
     spork (1.0.0rc4)
+    spring (1.1.1)
+    spring-commands-rspec (1.0.1)
+      spring (>= 0.9.1)
+    spring-commands-spinach (1.0.0)
+      spring (>= 0.9.1)
     sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -637,6 +642,9 @@ DEPENDENCIES
   slim
   spinach-rails
   spork (~> 1.0rc)
+  spring (= 1.1.1)
+  spring-commands-rspec (= 1.0.1)
+  spring-commands-spinach (= 1.0.0)
   stamp
   state_machine
   test_after_commit
-- 
cgit v1.2.3


From c35036c091adf71dca557edb6ffc5cb07e361500 Mon Sep 17 00:00:00 2001
From: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Date: Sat, 15 Feb 2014 21:03:10 +0100
Subject: Rails uses bin folder we forgot to create it when upgrading

---
 bin/bundle | 3 +++
 bin/rails  | 4 ++++
 bin/rake   | 4 ++++
 3 files changed, 11 insertions(+)
 create mode 100644 bin/bundle
 create mode 100644 bin/rails
 create mode 100644 bin/rake

diff --git a/bin/bundle b/bin/bundle
new file mode 100644
index 00000000000..66e9889e8b4
--- /dev/null
+++ b/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/rails b/bin/rails
new file mode 100644
index 00000000000..728cd85aa58
--- /dev/null
+++ b/bin/rails
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'
diff --git a/bin/rake b/bin/rake
new file mode 100644
index 00000000000..17240489f64
--- /dev/null
+++ b/bin/rake
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
-- 
cgit v1.2.3