Add latest changes from gitlab-org/gitlab@12-10-stable-ee

4 files changed, 10 insertions, 4 deletions

diff --git a/config/routes/issues.rb b/config/routes/issues.rb
index 9ac69975690..51b4637b89f 100644
--- a/config/routes/issues.rb
+++ b/config/routes/issues.rb
@@ -18,5 +18,6 @@ resources :issues, concerns: :awardable, constraints: { id: /\d+/ } do
   collection do
     post :bulk_update
     post :import_csv
+    post :export_csv
   end
 end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index ab7c439318f..1ce889dd578 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -26,10 +26,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
       scope '-' do
         get 'archive/*id', constraints: { format: Gitlab::PathRegex.archive_formats_regex, id: /.+?/ }, to: 'repositories#archive', as: 'archive'
 
-        scope controller: :static_site_editor do
-          get '/sse/*id', action: :show, as: :show_sse
-        end
-
         resources :artifacts, only: [:index, :destroy]
 
         resources :jobs, only: [:index, :show], constraints: { id: /\d+/ } do
diff --git a/config/routes/repository.rb b/config/routes/repository.rb
index 38d6cdbbaf8..eec204f2870 100644
--- a/config/routes/repository.rb
+++ b/config/routes/repository.rb
@@ -21,6 +21,9 @@ resources :commit, only: [:show], constraints: { id: /\h{7,40}/ } do
   end
 end
 
+# NOTE: Add new routes to repository_scoped.rb instead (see
+# https://docs.gitlab.com/ee/development/routing.html#project-routes).
+#
 # Don't use format parameter as file extension (old 3.0.x behavior)
 # See http://guides.rubyonrails.org/routing.html#route-globbing-and-wildcard-segments
 scope format: false do
diff --git a/config/routes/repository_scoped.rb b/config/routes/repository_scoped.rb
index c6343039d62..42ec8ca1806 100644
--- a/config/routes/repository_scoped.rb
+++ b/config/routes/repository_scoped.rb
@@ -30,5 +30,11 @@ scope format: false do
 
     resources :protected_branches, only: [:index, :show, :create, :update, :destroy, :patch], constraints: { id: Gitlab::PathRegex.git_reference_regex }
     resources :protected_tags, only: [:index, :show, :create, :update, :destroy]
+
+    scope constraints: { id: /[^\0]+/ } do
+      scope controller: :static_site_editor do
+        get '/sse/*id', action: :show, as: :show_sse
+      end
+    end
   end
 end