From 02a3f6241af193cabde303de5d1eea0e82c87cc5 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Fri, 26 Jan 2018 11:51:11 +0000
Subject: Update gitlab-styles and update .rubocop.yml

---
 .rubocop.yml | 4 ----
 Gemfile.lock | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 4e80b49ccd2..563a00db6c0 100644
--- 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:
diff --git a/Gemfile.lock b/Gemfile.lock
index 5532888d179..1a3c8f42469 100644
--- 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)
-- 
cgit v1.2.1