Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

2 files changed, 1 insertions, 9 deletions

diff --git a/lib/gitlab/utils/execution_tracker.rb b/lib/gitlab/utils/execution_tracker.rb
index 6d48658853c..92398926e1b 100644
--- a/lib/gitlab/utils/execution_tracker.rb
+++ b/lib/gitlab/utils/execution_tracker.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module Utils
     class ExecutionTracker
-      MAX_RUNTIME = 30.seconds
+      MAX_RUNTIME = 60.seconds
 
       ExecutionTimeOutError = Class.new(StandardError)
 
diff --git a/lib/gitlab/utils/usage_data.rb b/lib/gitlab/utils/usage_data.rb
index 19bdeefed7e..0b818b99ac7 100644
--- a/lib/gitlab/utils/usage_data.rb
+++ b/lib/gitlab/utils/usage_data.rb
@@ -291,14 +291,6 @@ module Gitlab
         end
       end
 
-      def epics_deepest_relationship_level
-        with_duration do
-          # rubocop: disable UsageData/LargeTable
-          { epics_deepest_relationship_level: ::Epic.deepest_relationship_level.to_i }
-          # rubocop: enable UsageData/LargeTable
-        end
-      end
-
       private
 
       def prometheus_client(verify:)