summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-05-23 18:25:47 +0000
committerRobert Speicher <robert@gitlab.com>2016-05-23 18:25:47 +0000
commit42aca7df0878428328601f75d6576f76d856d464 (patch)
tree33333c0d9bede6b5b8a2598042695b6ac48b99bc
parentd3fd58570c7116b4065eed49d744d1f66395f64d (diff)
parent51c167eeb75f429098b7128f9d9f33a6eec4145f (diff)
downloadgitlab-ce-42aca7df0878428328601f75d6576f76d856d464.tar.gz
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
-rw-r--r--.rubocop.yml3
-rw-r--r--lib/gitlab/bitbucket_import/client.rb2
2 files changed, 2 insertions, 3 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 832c31be162..9f91ee0bde0 100644
--- 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`.
diff --git a/lib/gitlab/bitbucket_import/client.rb b/lib/gitlab/bitbucket_import/client.rb
index 9b83292ef33..8d1ad62fae0 100644
--- 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