From 89a59ea5a4ab4f5d8968eef5ed412de703440359 Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Sat, 20 Jan 2018 13:48:18 -0800
Subject: [PATCH] actually switch to 0.48 - I was at 0.52

---
 Gemfile      |  2 +-
 Gemfile.lock | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 02a14979..077c481b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,7 +51,7 @@ group :development, :test do
   gem 'faker'
   gem 'pry-byebug'
   gem 'pry-rails'
-  gem 'rubocop', '~> 0.48' # match code climate https://github.com/tootsuite/mastodon/issues/1758
+  gem 'rubocop', '~> 0.48.1' # match code climate https://github.com/tootsuite/mastodon/issues/1758
   gem 'timecop'
   gem 'tunemygc'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index e143ecdf..75a7462a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -166,7 +166,6 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
-    parallel (1.12.1)
     parser (2.4.0.2)
       ast (~> 2.3)
     pg (0.21.0)
@@ -214,7 +213,8 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (3.0.0)
+    rainbow (2.2.2)
+      rake
     rake (12.3.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
@@ -240,11 +240,10 @@ GEM
       rspec-mocks (~> 3.6.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
-    rubocop (0.52.1)
-      parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+    rubocop (0.48.1)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
+      rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
@@ -332,7 +331,7 @@ DEPENDENCIES
   rails (~> 5.0.0)
   redis (~> 3.3.3)
   rspec-rails
-  rubocop (~> 0.48)
+  rubocop (~> 0.48.1)
   sass-rails
   shoulda-matchers
   simplecov