Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-01

# Conflicts:
#	app/services/search/group_service.rb

[ci skip]

app/services/search/group_service.rb

@@ -17,6 +17,7 @@ module Search
 
       @projects = super.inside_path(group.full_path)
     end
+<<<<<<< HEAD
 
     # rubocop: disable CodeReuse/ActiveRecord
     def elastic_projects
@@ -27,5 +28,7 @@ module Search
     def elastic_global
       false
     end
+=======
+>>>>>>> upstream/master
   end
 end