summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-01-24 17:53:38 +0100
committerRémy Coutable <remy@rymai.me>2018-01-25 11:07:30 +0100
commita38739a47eedf066a82041ef20759af5679cd658 (patch)
tree372ed43541cb52785f367468a80bef4dd47de689
parentdcb79741a170eaf673237bb2becbf6fb742a8bfd (diff)
downloadgitlab-ce-42385-enable-the-rspec-singlelinehook-cop.tar.gz
Update gitlab-styles and re-enable the RSpec/SingleLineHook cop again42385-enable-the-rspec-singlelinehook-cop
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--.rubocop_todo.yml4
-rw-r--r--Gemfile.lock2
2 files changed, 1 insertions, 5 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8d2276f71be..442d61bcf4f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -342,10 +342,6 @@ RSpec/SharedContext:
Exclude:
- 'spec/features/admin/admin_groups_spec.rb'
-# Offense count: 90
-RSpec/SingleLineHook:
- Enabled: false
-
# Offense count: 5
RSpec/VoidExpect:
Exclude:
diff --git a/Gemfile.lock b/Gemfile.lock
index 1cbeab8d6b5..c8570cbb897 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.0)
+ gitlab-styles (2.3.1)
rubocop (~> 0.51)
rubocop-gitlab-security (~> 0.1.0)
rubocop-rspec (~> 1.19)