diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-10-31 23:05:06 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-10-31 23:05:06 +0000 |
| commit | 31733b6fc5a9ba4443a5dd279e787e2fd8e31c6d (patch) | |
| tree | 03cf9e7bafeb4d3d013a80c9d5ceef7396b7f06d /lib | |
| parent | 59d4a6d81cb745c154928d4ad43ab0278da6bc94 (diff) | |
| parent | 01d8c1f6f0dacbb8d4779d0226e1c02eb11dfe0e (diff) | |
| download | gitlab-ce-31733b6fc5a9ba4443a5dd279e787e2fd8e31c6d.tar.gz | |
Merge branch 'da-rubocop-whitelist-active-record-none' into 'master'
Whitelist none method from ActiveRecord::Querying
See merge request gitlab-org/gitlab-ce!22726
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/user_extractor.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/user_extractor.rb b/lib/gitlab/user_extractor.rb index bd0d24e4369..9abd64c2250 100644 --- a/lib/gitlab/user_extractor.rb +++ b/lib/gitlab/user_extractor.rb @@ -14,13 +14,11 @@ module Gitlab @text = text end - # rubocop: disable CodeReuse/ActiveRecord def users return User.none unless @text.present? @users ||= User.from_union(union_relations) end - # rubocop: enable CodeReuse/ActiveRecord def usernames matches[:usernames] |