From 77b596b285c8f3fd78f1513841044e1374d1c380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= <jjbazan@gmail.com>
Date: Sat, 3 Jun 2017 13:07:02 +0200
Subject: [PATCH] updates rubocop (sec fix)

fixes a current vulnerability in /tmp directory
(https://github.com/bbatsov/rubocop/commit/dcb258fabd5f2624c1ea0e1634763
094590c09d7)
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 52c854618..54923356d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -89,7 +89,7 @@ group :development, :test do
   gem 'capistrano3-delayed-job', '~> 1.7.3'
   gem "bullet", '~> 5.5.1'
   gem "faker", '~> 1.7.3'
-  gem 'rubocop', '~> 0.48.1', require: false
+  gem 'rubocop', '~> 0.49.1', require: false
   gem 'knapsack'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 3590726c6..40071646c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -283,6 +283,7 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
+    parallel (1.11.2)
     paranoia (2.3.1)
       activerecord (>= 4.0, < 5.2)
     parser (2.4.0.0)
@@ -361,7 +362,8 @@ GEM
       rspec-mocks (~> 3.6.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
-    rubocop (0.48.1)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -525,7 +527,7 @@ DEPENDENCIES
   rinku (~> 2.0.2)
   rollbar (~> 2.14.1)
   rspec-rails (~> 3.6)
-  rubocop (~> 0.48.1)
+  rubocop (~> 0.49.1)
   rubyzip (~> 1.2.0)
   rvm1-capistrano3
   sass-rails (~> 5.0, >= 5.0.4)