diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-11-01 02:05:06 +0300 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-11-01 02:05:06 +0300 |
commit | 31733b6fc5a9ba4443a5dd279e787e2fd8e31c6d (patch) | |
tree | 03cf9e7bafeb4d3d013a80c9d5ceef7396b7f06d /app/services | |
parent | 59d4a6d81cb745c154928d4ad43ab0278da6bc94 (diff) | |
parent | 01d8c1f6f0dacbb8d4779d0226e1c02eb11dfe0e (diff) |
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 'app/services')
-rw-r--r-- | app/services/search/group_service.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/services/search/group_service.rb b/app/services/search/group_service.rb index 00372887985..34803d005e3 100644 --- a/app/services/search/group_service.rb +++ b/app/services/search/group_service.rb @@ -11,13 +11,11 @@ module Search @group = group end - # rubocop: disable CodeReuse/ActiveRecord def projects return Project.none unless group return @projects if defined? @projects @projects = super.inside_path(group.full_path) end - # rubocop: enable CodeReuse/ActiveRecord end end |