From ca65a621b8c20be3775d22e855248e2e7774c073 Mon Sep 17 00:00:00 2001
From: Brandon Dunne <bdunne@redhat.com>
Date: Mon, 19 Aug 2019 13:44:08 -0400
Subject: [PATCH] Merge pull request #19165 from d-m-u/removing_eo_time_patch

Removing Eo time patch

(cherry picked from commit cd7ab374b8079142572bf260b48dd1772f00b5cd)

https://bugzilla.redhat.com/show_bug.cgi?id=1743211
---
 Gemfile                                   |  5 ++---
 config/initializers/convert_time_to_eo.rb | 12 ------------
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 config/initializers/convert_time_to_eo.rb

diff --git a/Gemfile b/Gemfile
index 30a8e0960d5..a7e6951fdcf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -193,9 +193,8 @@ end
 group :scheduler, :manageiq_default do
   gem "rufus-scheduler"
 end
-# rufus has et-orbi dependency
-# this is temporary inclusion till we can get ConvertTimeToEoTime patch into upstream:
-gem "et-orbi"
+# rufus has et-orbi dependency, v1.2.2 has patch for ConvertTimeToEoTime that we need
+gem "et-orbi",                          ">= 1.2.2"
 
 group :seed, :manageiq_default do
   manageiq_plugin "manageiq-content"
diff --git a/config/initializers/convert_time_to_eo.rb b/config/initializers/convert_time_to_eo.rb
deleted file mode 100644
index 7d0f9f10471..00000000000
--- a/config/initializers/convert_time_to_eo.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# temporary hack for when/if we can get patch accepted upscream
-# et-orbi doesn't support comparisons of EoTime in the scheduler with user provided Time objects
-# see https://github.com/ManageIQ/manageiq/pull/19153#issuecomment-521719495
-module ConvertTimeToEoTime
-  def ==(*args)
-    o = EtOrbi.make_time(args.first) if args.first.kind_of?(Time) || args.first.kind_of?(DateTime)
-    super(o)
-  end
-end
-
-require 'et-orbi'
-EtOrbi::EoTime.prepend(ConvertTimeToEoTime)