Merge branch 'rs-range-include' into 'master'

Enable Performance/RangeInclude cop and fix single offense Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478 See merge request !4255

Merge branch 'rs-range-include' into 'master'
42aca7df · Robert Speicher · d3fd5857 · 51c167ee · 42aca7df · 42aca7df
Commit 42aca7df authored May 23, 2016 by Robert Speicher
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

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

client.rb lib/gitlab/bitbucket_import/client.rb +1 -1

No files found.
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -957,10 +957,9 @@ Performance/EndWith:
 Performance/LstripRstrip:
  Enabled: true

-# TODO: Enable RangeInclude Cop.
 # Use `Range#cover?` instead of `Range#include?`.
 Performance/RangeInclude:
-  Enabled: false
+  Enabled: true

 # TODO: Enable RedundantBlockCall Cop.
 # Use `yield` instead of `block.call`.

--- a/lib/gitlab/bitbucket_import/client.rb
+++ b/lib/gitlab/bitbucket_import/client.rb
@@ -121,7 +121,7 @@ module Gitlab

      def get(url)
        response = api.get(url)
-        raise Unauthorized if (400..499).include?(response.code.to_i)
+        raise Unauthorized if (400..499).cover?(response.code.to_i)

        response
      end