diff --git a/.rubocop.yml b/.rubocop.yml
index c69a64de8..3f5eb13ca 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -100,7 +100,6 @@ Style/HashSyntax:
 
 Style/IfUnlessModifier:
   Enabled: true
-  Metrics/LineLength: 80
 
 Layout/IndentationConsistency:
   EnforcedStyle: normal
@@ -377,10 +376,7 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Enabled: false
 
-##################### Lint #####################################
-
-Lint/AssignmentInCondition:
-  AllowSafeAssignment: true
+##################### Layout ###################################
 
 Layout/BlockAlignment:
   EnforcedStyleAlignWith: either
@@ -388,12 +384,17 @@ Layout/BlockAlignment:
 Layout/EndAlignment:
   EnforcedStyleAlignWith: keyword
 
-Lint/DuplicateMethods:
-  Enabled: false
-
 Layout/DefEndAlignment:
   EnforcedStyleAlignWith: start_of_line
 
+##################### Lint #####################################
+
+Lint/AssignmentInCondition:
+  AllowSafeAssignment: true
+
+Lint/DuplicateMethods:
+  Enabled: false
+
 Lint/UnusedBlockArgument:
   IgnoreEmptyBlocks: true
   AllowUnusedKeywordArguments: false
@@ -408,7 +409,7 @@ Lint/EachWithObjectArgument:
 Lint/HandleExceptions:
   Enabled: false
 
-Lint/LiteralInCondition:
+Lint/LiteralAsCondition:
   Enabled: true
 
 Lint/EmptyInterpolation:
diff --git a/Gemfile b/Gemfile
index 881bcefca..ed8b6defa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -105,7 +105,7 @@ group :development, :test do
   gem 'better_errors'
   gem 'binding_of_caller'
   gem 'awesome_print'
-  gem 'rubocop', '= 0.51.0', require: false
+  gem 'rubocop', '>= 0.59.0', require: false
   gem 'scss_lint', require: false
   gem 'starscope', require: false
   gem 'bullet'
diff --git a/Gemfile.lock b/Gemfile.lock
index c5f2bd7e6..37578eb0a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,7 +102,7 @@ GEM
       railties (>= 3.1)
     arel (8.0.0)
     aspector (0.14.0)
-    ast (2.3.0)
+    ast (2.4.0)
     auto_strip_attributes (2.2.0)
       activerecord (>= 3.0)
     autoprefixer-rails (7.2.5)
@@ -239,6 +239,7 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n-js (3.0.3)
       i18n (~> 0.6, >= 0.6.6)
+    jaro_winkler (1.5.1)
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
       multi_json (>= 1.2)
@@ -334,8 +335,8 @@ GEM
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
     parallel (1.12.1)
-    parser (2.4.0.2)
-      ast (~> 2.3)
+    parser (2.5.1.2)
+      ast (~> 2.4.0)
     pg (0.21.0)
     phantomjs (2.1.1.0)
     poltergeist (1.17.0)
@@ -343,7 +344,7 @@ GEM
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     polyglot (0.3.5)
-    powerpack (0.1.1)
+    powerpack (0.1.2)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -391,8 +392,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.0.0)
     rake (12.3.1)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
@@ -427,15 +427,16 @@ GEM
       rspec-mocks (~> 3.7.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
-    rubocop (0.51.0)
+    rubocop (0.59.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-graphviz (1.2.3)
-    ruby-progressbar (1.9.0)
+    ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
     rubyzip (1.2.1)
     sanitize (4.6.6)
@@ -507,7 +508,7 @@ GEM
     uglifier (4.1.4)
       execjs (>= 0.3.0, < 3)
     underscore-rails (1.8.3)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.4.0)
     uniform_notifier (1.11.0)
     warden (1.2.7)
       rack (>= 1.0)
@@ -601,7 +602,7 @@ DEPENDENCIES
   rgl
   roo (~> 2.7.1)
   rspec-rails
-  rubocop (= 0.51.0)
+  rubocop (>= 0.59.0)
   ruby-graphviz (~> 1.2)
   rubyzip
   sanitize (~> 4.4)