Merge branch 'time-windows-cleanup' into 'master'

Make EE prometheus args behavior default -> metrics time window

Closes #10894

See merge request gitlab-org/gitlab-ee!10371

ee/app/models/concerns/ee/prometheus_adapter.rb

@@ -10,14 +10,5 @@ module EE
 
       clear_reactive_cache!(query_class.name, *query_args)
     end
-
-    private
-
-    override :build_query_args
-    def build_query_args(*args)
-      args.map do |arg|
-        arg.respond_to?(:id) ? arg.id : arg
-      end
-    end
   end
 end