From 4ac7fb1c1afa170ce4e31c0da980a49e15c3e662 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Wed, 23 Aug 2017 17:10:39 +0300
Subject: [PATCH] Update rubocop gem

#579
---
 Gemfile      |  2 +-
 Gemfile.lock | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 267f7b43c..ea6f5260b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -116,7 +116,7 @@ gem 'jquery-ui-rails', '5.0.5'
 group :development do
   gem 'spring'
   gem 'spring-commands-rspec'
-  gem 'rubocop',               '0.48.1'
+  gem 'rubocop'
 
   # deploy
   gem 'mina', '0.3.1' # for fast deployment
diff --git a/Gemfile.lock b/Gemfile.lock
index f1e98d929..3c91065a5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -290,6 +290,7 @@ GEM
     nprogress-rails (0.1.6.7)
     open4 (1.3.4)
     orm_adapter (0.5.0)
+    parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
     pdfkit (0.6.2)
@@ -351,7 +352,8 @@ GEM
       activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.1)
+    rainbow (2.2.2)
+      rake
     rake (12.0.0)
     ransack (1.5.1)
       actionpack (>= 3.0)
@@ -389,7 +391,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)
@@ -463,7 +466,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    unicode-display_width (1.2.0)
+    unicode-display_width (1.3.0)
     unicode_utils (1.4.0)
     uniform_notifier (1.9.0)
     uuidtools (2.1.5)
@@ -556,7 +559,7 @@ DEPENDENCIES
   ransack (= 1.5.1)
   rest-client
   rspec-rails (~> 3.6)
-  rubocop (= 0.48.1)
+  rubocop
   sass-rails (= 5.0.6)
   sdoc (= 0.4.1)
   select2-rails (= 3.5.9.3)