Commit 48d0723d authored by Robert Speicher's avatar Robert Speicher

Resolve app/services/search/group_service.rb

parent df598db2
......@@ -19,7 +19,6 @@ module Search
@projects = super.inside_path(group.full_path)
end
# rubocop: enable CodeReuse/ActiveRecord
<<<<<<< HEAD
# rubocop: disable CodeReuse/ActiveRecord
def elastic_projects
......@@ -30,7 +29,5 @@ module Search
def elastic_global
false
end
=======
>>>>>>> upstream/master
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment