From 97f0ae7454597105a27df65ffb772949d9d4f3cb Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 14 Apr 2020 09:09:34 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/routes/project.rb | 4 ++++ config/routes/repository.rb | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'config/routes') diff --git a/config/routes/project.rb b/config/routes/project.rb index 943ff24ffee..77183c963d0 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -26,6 +26,10 @@ 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 8a635745907..38d6cdbbaf8 100644 --- a/config/routes/repository.rb +++ b/config/routes/repository.rb @@ -67,10 +67,6 @@ scope format: false do 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 '/raw/*id', to: 'raw#show', as: :raw get '/blame/*id', to: 'blame#show', as: :blame -- cgit v1.2.3