From 8e13b6a8759a43bb8a90444139b4fbb4205a1b74 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 31 Jul 2023 14:36:41 +0000
Subject: Add latest changes from gitlab-org/security/gitlab@16-2-stable-ee

---
 lib/banzai/filter/plantuml_filter.rb | 11 +----------
 lib/gitlab/asciidoc.rb               | 11 +----------
 lib/gitlab/plantuml.rb               | 20 ++++++++++++++++++++
 3 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 lib/gitlab/plantuml.rb

(limited to 'lib')

diff --git a/lib/banzai/filter/plantuml_filter.rb b/lib/banzai/filter/plantuml_filter.rb
index 2e5f1b29c52..7e6535b86fd 100644
--- a/lib/banzai/filter/plantuml_filter.rb
+++ b/lib/banzai/filter/plantuml_filter.rb
@@ -11,7 +11,7 @@ module Banzai
       def call
         return doc unless settings.plantuml_enabled? && doc.at_xpath(lang_tag)
 
-        plantuml_setup
+        Gitlab::Plantuml.configure
 
         doc.xpath(lang_tag).each do |node|
           img_tag = Nokogiri::HTML::DocumentFragment.parse(
@@ -38,15 +38,6 @@ module Banzai
       def settings
         Gitlab::CurrentSettings.current_application_settings
       end
-
-      def plantuml_setup
-        Asciidoctor::PlantUml.configure do |conf|
-          conf.url = settings.plantuml_url
-          conf.png_enable = settings.plantuml_enabled
-          conf.svg_enable = false
-          conf.txt_enable = false
-        end
-      end
     end
   end
 end
diff --git a/lib/gitlab/asciidoc.rb b/lib/gitlab/asciidoc.rb
index 955cb14594f..31e8dcd84b7 100644
--- a/lib/gitlab/asciidoc.rb
+++ b/lib/gitlab/asciidoc.rb
@@ -78,20 +78,11 @@ module Gitlab
       context[:pipeline] = :ascii_doc
       context[:max_includes] = [MAX_INCLUDES, context[:max_includes]].compact.min
 
-      plantuml_setup
+      Gitlab::Plantuml.configure
 
       html = ::Asciidoctor.convert(input, asciidoc_opts)
       html = Banzai.render(html, context)
       html.html_safe
     end
-
-    def self.plantuml_setup
-      Asciidoctor::PlantUml.configure do |conf|
-        conf.url = Gitlab::CurrentSettings.plantuml_url
-        conf.svg_enable = Gitlab::CurrentSettings.plantuml_enabled
-        conf.png_enable = Gitlab::CurrentSettings.plantuml_enabled
-        conf.txt_enable = false
-      end
-    end
   end
 end
diff --git a/lib/gitlab/plantuml.rb b/lib/gitlab/plantuml.rb
new file mode 100644
index 00000000000..9ec544452fd
--- /dev/null
+++ b/lib/gitlab/plantuml.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "asciidoctor_plantuml/plantuml"
+
+module Gitlab
+  module Plantuml
+    class << self
+      def configure
+        Asciidoctor::PlantUml.configure do |conf|
+          conf.url        = Gitlab::CurrentSettings.plantuml_url
+          conf.png_enable = Gitlab::CurrentSettings.plantuml_enabled
+          conf.svg_enable = false
+          conf.txt_enable = false
+
+          conf
+        end
+      end
+    end
+  end
+end
-- 
cgit v1.2.3