From f5a7c4c90a67f225ea8827faa88a9f90b24eb5e7 Mon Sep 17 00:00:00 2001
From: wvengen <dev-voko@willem.engen.nl>
Date: Sat, 30 May 2015 19:12:33 +0200
Subject: [PATCH] Bundle update

---
 Gemfile      |  1 -
 Gemfile.lock | 30 +++++++++++++++---------------
 Rakefile     |  1 +
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Gemfile b/Gemfile
index 394b0e5c..88009f3d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -107,7 +107,6 @@ group :test do
   # need to include rspec components before i18n-spec or rake fails in test environment
   gem 'rspec-core', '~> 3.2'
   gem 'rspec-rerun'
-  gem 'rspec-legacy_formatters'
   gem 'i18n-spec'
   # code coverage
   gem 'simplecov', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 7e6bba15..d8144e89 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,7 +90,7 @@ GEM
     bootstrap-datepicker-rails (1.4.0)
       railties (>= 3.0)
     builder (3.2.2)
-    bullet (4.14.6)
+    bullet (4.14.7)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.9.0)
     callsite (0.0.11)
@@ -186,7 +186,7 @@ GEM
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
-    i18n-js (3.0.0.rc9)
+    i18n-js (3.0.0.rc10)
       i18n (~> 0.6)
     i18n-spec (0.6.0)
       iso
@@ -227,9 +227,9 @@ GEM
       rack-contrib (~> 1.1)
       railties (>= 3.0.0, < 5.0.0)
     method_source (0.8.2)
-    mime-types (2.5)
+    mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.6.1)
+    minitest (5.7.0)
     mono_logger (1.1.0)
     multi_json (1.11.0)
     mysql2 (0.3.18)
@@ -360,16 +360,17 @@ GEM
       rspec-expectations (~> 3.2.0)
       rspec-mocks (~> 3.2.0)
       rspec-support (~> 3.2.0)
-    rspec-rerun (0.3.0)
-      rspec
+    rspec-rerun (1.0.0)
+      rspec (~> 3.0)
+      rspec-legacy_formatters
     rspec-support (3.2.2)
     ruby-ole (1.2.11.8)
     ruby-prof (0.15.8)
     ruby-units (1.4.5)
-    ruby_parser (3.6.6)
+    ruby_parser (3.7.0)
       sexp_processor (~> 4.1)
     rubyzip (1.1.7)
-    sass (3.4.13)
+    sass (3.4.14)
     sass-rails (5.0.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -383,12 +384,12 @@ GEM
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    sexp_processor (4.5.1)
+    sexp_processor (4.6.0)
     simple-navigation (3.14.0)
       activesupport (>= 2.3.2)
-    simple-navigation-bootstrap (1.0.0)
+    simple-navigation-bootstrap (1.0.2)
       railties (>= 3.1)
-      simple-navigation (>= 3.7.0)
+      simple-navigation (>= 3.7.0, < 4.0.0)
     simple_form (3.1.0)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
@@ -407,9 +408,9 @@ GEM
     slop (3.6.0)
     spreadsheet (1.0.3)
       ruby-ole (>= 1.0)
-    sprockets (3.0.3)
+    sprockets (3.1.0)
       rack (~> 1.0)
-    sprockets-rails (2.3.0)
+    sprockets-rails (2.3.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -430,7 +431,7 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
-    tins (1.5.1)
+    tins (1.5.2)
     ttfunk (1.4.0)
     twitter-bootstrap-rails (2.2.8)
       actionpack (>= 3.1)
@@ -523,7 +524,6 @@ DEPENDENCIES
   roo (~> 2.0.0)
   roo-xls
   rspec-core (~> 3.2)
-  rspec-legacy_formatters
   rspec-rails
   rspec-rerun
   ruby-prof
diff --git a/Rakefile b/Rakefile
index 3d3dd484..2cb2213e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,5 +4,6 @@
 
 require File.expand_path('../config/application', __FILE__)
 require 'rake'
+require 'rspec-rerun/tasks'
 
 Foodsoft::Application.load_tasks