Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

1 files changed, 22 insertions, 0 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e675c01bcbb..feeedb0a501 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -18,6 +18,28 @@ module ApplicationHelper
     end
   end
 
+  def dispensable_render(...)
+    render(...)
+  rescue StandardError => error
+    if Feature.enabled?(:dispensable_render, default_enabled: :yaml)
+      Gitlab::ErrorTracking.track_and_raise_for_dev_exception(error)
+      nil
+    else
+      raise error
+    end
+  end
+
+  def dispensable_render_if_exists(...)
+    render_if_exists(...)
+  rescue StandardError => error
+    if Feature.enabled?(:dispensable_render, default_enabled: :yaml)
+      Gitlab::ErrorTracking.track_and_raise_for_dev_exception(error)
+      nil
+    else
+      raise error
+    end
+  end
+
   def partial_exists?(partial)
     lookup_context.exists?(partial, [], true)
   end