Merge branch 'christian/rubocopfixes'

DataDog · Jan 16, 2017 · b1b337b · b1b337b
2 parents 1b724b8 + d2b09ea
commit b1b337b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -24,7 +24,7 @@ Metrics/MethodLength:
 Style/AccessorMethodName:
   Enabled: false
 
-Style/MethodCallParentheses:
+Style/MethodCallWithoutArgsParentheses:
   Enabled: false
 
 Style/RescueModifier:

diff --git a/test/helper.rb b/test/helper.rb
@@ -129,6 +129,7 @@ def helper_error_mode!(mode)
   # - then arrays contain, as a FIFO, all the data passed to send(endpoint, data)
   def helper_dump
     @helper_mutex.synchronize do
+      # rubocop:disable Security/MarshalLoad
       return Marshal.load(Marshal.dump(@helper_sent))
     end
   end