Merge pull request #19165 from d-m-u/removing_eo_time_patch

Removing Eo time patch (cherry picked from commit cd7ab37) https://bugzilla.redhat.com/show_bug.cgi?id=1743211
ManageIQ · Aug 19, 2019 · ca65a62 · ca65a62
1 parent 63b2fef
commit ca65a62
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git 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