Update gitlab-styles and update .rubocop.yml

02a3f624 · Lin Jen-Shin · e7115a3e · 02a3f624 · 02a3f624
Commit 02a3f624 authored Jan 26, 2018 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

.rubocop.yml .rubocop.yml +0 -4

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -19,10 +19,6 @@ AllCops:
    - 'builds/**/*'
  CacheRootDirectory: tmp

-# TODO: Remove me after updating gitlab-style
-Style/TrailingUnderscoreVariable:
-  Enabled: false
-
 # Gitlab ###################################################################

 Gitlab/ModuleWithInstanceVariables:

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -304,7 +304,7 @@ GEM
      mime-types (>= 1.16)
      posix-spawn (~> 0.3)
    gitlab-markup (1.6.3)
-    gitlab-styles (2.3.1)
+    gitlab-styles (2.3.2)
      rubocop (~> 0.51)
      rubocop-gitlab-security (~> 0.1.0)
      rubocop-rspec (~> 1.19)