Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 4 deletions

diff --git a/config/routes/project.rb b/config/routes/project.rb
index 8a5e20c8eff..2cc04da6f35 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -258,6 +258,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
             post :list_projects
           end
         end
+
+        # The wiki routing contains wildcard characters so
+        # its preferable to keep it below all other project routes
+        draw :wiki
       end
       # End of the /-/ scope.
 
@@ -523,9 +527,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         post :web_ide_clientside_preview
       end
 
-      # Since both wiki and repository routing contains wildcard characters
+      # The repository routing contains wildcard characters so
       # its preferable to keep it below all other project routes
-      draw :wiki
       draw :repository
 
       # All new routes should go under /-/ scope.
@@ -542,7 +545,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
                                             :forks, :group_links, :import, :avatar, :mirror,
                                             :cycle_analytics, :mattermost, :variables, :triggers,
                                             :environments, :protected_environments, :error_tracking,
-                                            :serverless, :clusters, :audit_events)
+                                            :serverless, :clusters, :audit_events, :wikis)
     end
 
     # rubocop: disable Cop/PutProjectRoutesUnderScope
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 3a43f515a1b..c0be2f66ca7 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -185,7 +185,7 @@ module.exports = {
         options: { limit: 2048 },
       },
       {
-        test: /\_worker\.js$/,
+        test: /_worker\.js$/,
         use: [
           {
             loader: 'worker-loader',