Merge pull request #1295 from Growstuff/bundle-update-2017-03-30-121732

Bundle Update on 2017-03-30

Gemfile

@@ -129,7 +129,7 @@ group :development, :test do
   gem 'rainbow', '< 2.2.0' # See https://github.com/sickill/rainbow/issues/44
   gem 'rspec-activemodel-mocks'
   gem 'rspec-rails' # unit testing framework
-  gem 'rubocop', require: false
+  gem 'rubocop', '<= 0.47.1', require: false # Pin to rubocop (0.47.1) as 0.48.0 is buggy
   gem 'selenium-webdriver'
   gem 'webrat' # provides HTML matchers for view tests
 end

Gemfile.lock

@@ -25,8 +25,8 @@ GEM
       addressable
     active_merchant-paypal-bogus-gateway (0.1.0)
       activemerchant
-    active_utils (3.3.0)
-      activesupport (>= 3.2, < 5.1.0)
+    active_utils (3.3.1)
+      activesupport (>= 3.2, < 5.2.0)
       i18n
     activejob (4.2.8)
       activesupport (= 4.2.8)
@@ -48,7 +48,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     arel (6.0.4)
     ast (2.3.0)
@@ -93,7 +93,7 @@ GEM
     capybara-screenshot (1.0.14)
       capybara (>= 1.0, < 3)
       launchy
-    childprocess (0.6.2)
+    childprocess (0.6.3)
       ffi (~> 1.0, >= 1.0.11)
     climate_control (0.1.0)
     cliver (0.3.2)
@@ -472,7 +472,7 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sysexits (1.2.0)
-    term-ansicolor (1.4.0)
+    term-ansicolor (1.5.0)
       tins (~> 1.0)
     terminal-table (1.7.3)
       unicode-display_width (~> 1.1.1)
@@ -482,7 +482,7 @@ GEM
     tilt (2.0.7)
     tins (1.13.2)
     trollop (1.16.2)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
@@ -580,7 +580,7 @@ DEPENDENCIES
   rake (>= 10.0.0)
   rspec-activemodel-mocks
   rspec-rails
-  rubocop
+  rubocop (<= 0.47.1)
   ruby-units
   sass-rails (~> 5.0.4)
   selenium-webdriver