From b64b61bfe72c54fe4a7fdce34b2f1591e3822e5e Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 1 Nov 2022 11:52:52 +0000
Subject: Add latest changes from gitlab-org/security/gitlab@15-5-stable-ee

---
 config/routes.rb         | 1 +
 config/routes/project.rb | 1 +
 config/webpack.config.js | 1 +
 3 files changed, 3 insertions(+)

(limited to 'config')

diff --git a/config/routes.rb b/config/routes.rb
index 28c08e9bbe7..6cfbb969acb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -119,6 +119,7 @@ InitializerConnections.with_disabled_database_connections do
 
       # sandbox
       get '/sandbox/mermaid' => 'sandbox#mermaid'
+      get '/sandbox/swagger' => 'sandbox#swagger'
 
       get '/whats_new' => 'whats_new#index'
 
diff --git a/config/routes/project.rb b/config/routes/project.rb
index cd9315ba2aa..0b0d370223c 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -86,6 +86,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
             get :download
             get :browse, path: 'browse(/*path)', format: false
             get :file, path: 'file/*path', format: false
+            get :external_file, path: 'external_file/*path', format: false
             get :raw, path: 'raw/*path', format: false
             post :keep
           end
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 05523952769..d79e6e12b39 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -165,6 +165,7 @@ function generateEntries() {
     jira_connect_app: './jira_connect/subscriptions/index.js',
     sandboxed_mermaid: './lib/mermaid.js',
     redirect_listbox: './entrypoints/behaviors/redirect_listbox.js',
+    sandboxed_swagger: './lib/swagger.js',
   };
 
   return Object.assign(manualEntries, incrementalCompiler.filterEntryPoints(autoEntries));
-- 
cgit v1.2.1