Merge branch 'rs-def-with-parenthesis' into 'master'

Enable Style/DefWithParentheses cop and fix single offense Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478 See merge request !4254

Merge branch 'rs-def-with-parenthesis' into 'master'
74ce3faa · Robert Speicher · 68b8e86a · 013bccbd · 74ce3faa · 74ce3faa
Commit 74ce3faa authored May 23, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

.rubocop.yml .rubocop.yml +1 -1

helpers.rb lib/api/helpers.rb +1 -1

No files found.
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -152,7 +152,7 @@ Style/ConstantName:

 # Use def with parentheses when there are arguments.
 Style/DefWithParentheses:
-  Enabled: false
+  Enabled: true

 # Checks for use of deprecated Hash methods.
 Style/DeprecatedHashMethods:

--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -29,7 +29,7 @@ module API
      @current_user
    end

-    def sudo_identifier()
+    def sudo_identifier
      identifier ||= params[SUDO_PARAM] || env[SUDO_HEADER]

      # Regex for integers