summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2019-07-24 20:39:34 +0000
committerMayra Cabrera <mcabrera@gitlab.com>2019-07-24 20:39:34 +0000
commit35ec674ee69a04d771ed82eeb205c3cd527e4112 (patch)
tree718e125cb8789236e249701f7ffb02e2fd0f5b90 /app
parentfeb07ce08e755786ec869f31eef57c67d70eecb7 (diff)
parent3e001d29ccdb5a5b1ba223710525f8dc7ae844ee (diff)
downloadgitlab-ce-35ec674ee69a04d771ed82eeb205c3cd527e4112.tar.gz
Merge branch 'sh-enable-rubocop-hash-search' into 'master'
Enable Rubocop Performance/InefficientHashSearch Closes #64975 See merge request gitlab-org/gitlab-ce!31117
Diffstat (limited to 'app')
-rw-r--r--app/controllers/concerns/sessionless_authentication.rb2
-rw-r--r--app/models/note.rb2
-rw-r--r--app/models/user_preference.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/concerns/sessionless_authentication.rb b/app/controllers/concerns/sessionless_authentication.rb
index 590eefc6dab..4304b8565ce 100644
--- a/app/controllers/concerns/sessionless_authentication.rb
+++ b/app/controllers/concerns/sessionless_authentication.rb
@@ -13,7 +13,7 @@ module SessionlessAuthentication
end
def sessionless_user?
- current_user && !session.keys.include?('warden.user.user.key')
+ current_user && !session.key?('warden.user.user.key')
end
def sessionless_sign_in(user)
diff --git a/app/models/note.rb b/app/models/note.rb
index 5c31cff9816..3f182c1f099 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -292,7 +292,7 @@ class Note < ApplicationRecord
end
def special_role=(role)
- raise "Role is undefined, #{role} not found in #{SpecialRole.values}" unless SpecialRole.values.include?(role)
+ raise "Role is undefined, #{role} not found in #{SpecialRole.values}" unless SpecialRole.value?(role)
@special_role = role
end
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index f1326f4c8cb..b236250c24e 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -26,7 +26,7 @@ class UserPreference < ApplicationRecord
def set_notes_filter(filter_id, issuable)
# No need to update the column if the value is already set.
- if filter_id && NOTES_FILTERS.values.include?(filter_id)
+ if filter_id && NOTES_FILTERS.value?(filter_id)
field = notes_filter_field_for(issuable)
self[field] = filter_id