Disable two cops as recommended.

2 files changed, 24 insertions, 26 deletions

diff --git a/.rubocop.yml b/.rubocop.yml
index ce4287a2796..db0bcfadcf4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -37,6 +37,10 @@ AllCops:
 Style/AccessModifierIndentation:
   Enabled: true
 
+# Check the naming of accessor methods for get_/set_.
+Style/AccessorMethodName:
+  Enabled: false
+
 # Use alias_method instead of alias.
 Style/Alias:
   EnforcedStyle: prefer_alias_method
@@ -239,6 +243,10 @@ Style/MethodDefParentheses:
 Style/MethodName:
   Enabled: true
 
+# Checks for usage of `extend self` in modules.
+Style/ModuleFunction:
+  Enabled: false
+
 # Checks that the closing brace in an array literal is either on the same line
 # as the last array element, or a new line.
 Style/MultilineArrayBraceLayout:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index cb6df9d88c2..8204fd82a63 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 8`
-# on 2016-07-03 15:32:25 -0600 using RuboCop version 0.41.1.
+# on 2016-07-05 10:30:07 -0600 using RuboCop version 0.41.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 152
+# Offense count: 154
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
 
@@ -52,7 +52,7 @@ Lint/StringConversionInInterpolation:
 Lint/UnusedBlockArgument:
   Enabled: false
 
-# Offense count: 125
+# Offense count: 129
 # Cop supports --auto-correct.
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
 Lint/UnusedMethodArgument:
@@ -114,11 +114,7 @@ Rails/TimeZone:
 Rails/Validation:
   Enabled: false
 
-# Offense count: 18
-Style/AccessorMethodName:
-  Enabled: false
-
-# Offense count: 208
+# Offense count: 218
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
 # SupportedStyles: with_first_parameter, with_fixed_indentation
@@ -139,7 +135,7 @@ Style/AndOr:
 Style/BarePercentLiterals:
   Enabled: false
 
-# Offense count: 255
+# Offense count: 256
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: braces, no_braces, context_dependent
@@ -176,7 +172,7 @@ Style/CommentAnnotation:
 Style/ConditionalAssignment:
   Enabled: false
 
-# Offense count: 762
+# Offense count: 773
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: leading, trailing
@@ -194,7 +190,7 @@ Style/EachWithObject:
     - 'lib/ci/ansi2html.rb'
     - 'lib/gitlab/import_export/members_mapper.rb'
 
-# Offense count: 29
+# Offense count: 30
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: empty, nil, both
@@ -244,7 +240,7 @@ Style/IdenticalConditionalBranches:
 Style/IfInsideElse:
   Enabled: false
 
-# Offense count: 178
+# Offense count: 179
 # Cop supports --auto-correct.
 # Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
@@ -297,19 +293,13 @@ Style/MethodCallParentheses:
     - 'spec/helpers/submodule_helper_spec.rb'
     - 'spec/workers/post_receive_spec.rb'
 
-# Offense count: 9
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: module_function, extend_self
-Style/ModuleFunction:
-  Enabled: false
-
 # Offense count: 3
 Style/MultilineTernaryOperator:
   Exclude:
     - 'lib/banzai/filter/relative_link_filter.rb'
     - 'spec/support/api_helpers.rb'
 
-# Offense count: 62
+# Offense count: 61
 # Cop supports --auto-correct.
 Style/MutableConstant:
   Enabled: false
@@ -348,7 +338,7 @@ Style/NumericLiteralPrefix:
 Style/ParallelAssignment:
   Enabled: false
 
-# Offense count: 201
+# Offense count: 206
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
@@ -379,7 +369,7 @@ Style/PerlBackrefs:
 Style/PredicateName:
   Enabled: false
 
-# Offense count: 28
+# Offense count: 27
 # Cop supports --auto-correct.
 Style/PreferredHashMethods:
   Enabled: false
@@ -394,7 +384,7 @@ Style/Proc:
     - 'lib/api/api_guard.rb'
     - 'spec/initializers/trusted_proxies_spec.rb'
 
-# Offense count: 21
+# Offense count: 20
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: compact, exploded
@@ -420,7 +410,7 @@ Style/RedundantException:
 Style/RedundantFreeze:
   Enabled: false
 
-# Offense count: 312
+# Offense count: 321
 # Cop supports --auto-correct.
 Style/RedundantSelf:
   Enabled: false
@@ -466,7 +456,7 @@ Style/SingleLineMethods:
 Style/SpaceAroundEqualsInParameterDefault:
   Enabled: false
 
-# Offense count: 118
+# Offense count: 119
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: space, no_space
@@ -494,7 +484,7 @@ Style/SpaceBeforeFirstArg:
 Style/SpaceInsideBlockBraces:
   Enabled: false
 
-# Offense count: 92
+# Offense count: 98
 # Cop supports --auto-correct.
 Style/SpaceInsideBrackets:
   Enabled: false
@@ -558,7 +548,7 @@ Style/TrailingUnderscoreVariable:
     - 'lib/gitlab/force_push_check.rb'
     - 'lib/gitlab/logger.rb'
 
-# Offense count: 89
+# Offense count: 88
 # Cop supports --auto-correct.
 Style/TrailingWhitespace:
   Enabled: false