Commit a516e498 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch 'revert_28689' into 'master'

Fix regression with sse route clobbering projects

See merge request gitlab-org/gitlab!29453
parents 843c7026 d32f3e55
...@@ -26,6 +26,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do ...@@ -26,6 +26,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
scope '-' do scope '-' do
get 'archive/*id', constraints: { format: Gitlab::PathRegex.archive_formats_regex, id: /.+?/ }, to: 'repositories#archive', as: 'archive' 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 :artifacts, only: [:index, :destroy]
resources :jobs, only: [:index, :show], constraints: { id: /\d+/ } do resources :jobs, only: [:index, :show], constraints: { id: /\d+/ } do
......
...@@ -67,10 +67,6 @@ scope format: false do ...@@ -67,10 +67,6 @@ scope format: false do
end end
end end
scope controller: :static_site_editor do
get '/sse/*id', action: :show, as: :show_sse
end
get '/tree/*id', to: 'tree#show', as: :tree get '/tree/*id', to: 'tree#show', as: :tree
get '/raw/*id', to: 'raw#show', as: :raw get '/raw/*id', to: 'raw#show', as: :raw
get '/blame/*id', to: 'blame#show', as: :blame get '/blame/*id', to: 'blame#show', as: :blame
......
...@@ -98,7 +98,6 @@ module Gitlab ...@@ -98,7 +98,6 @@ module Gitlab
preview preview
raw raw
refs refs
sse
tree tree
update update
wikis wikis
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment