Add latest changes from gitlab-org/gitlab@master

3 files changed, 13 insertions, 11 deletions

diff --git a/config/routes/project.rb b/config/routes/project.rb
index 352184ed746..791f6cc2a4e 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -301,17 +301,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           defaults: { format: 'json' },
           constraints: { template_type: %r{issue|merge_request}, format: 'json' }
 
-      resources :commit, only: [:show], constraints: { id: /\h{7,40}/ } do
-        member do
-          get :branches
-          get :pipelines
-          post :revert
-          post :cherry_pick
-          get :diff_for_path
-          get :merge_requests
-        end
-      end
-
       resource :pages, only: [:show, :update, :destroy] do
         resources :domains, except: :index, controller: 'pages_domains', constraints: { id: %r{[^/]+} } do
           member do
diff --git a/config/routes/repository.rb b/config/routes/repository.rb
index d4805b67a5c..38d6cdbbaf8 100644
--- a/config/routes/repository.rb
+++ b/config/routes/repository.rb
@@ -10,6 +10,17 @@ resource :repository, only: [:create] do
   end
 end
 
+resources :commit, only: [:show], constraints: { id: /\h{7,40}/ } do
+  member do
+    get :branches
+    get :pipelines
+    post :revert
+    post :cherry_pick
+    get :diff_for_path
+    get :merge_requests
+  end
+end
+
 # 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/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 1e1ed52650b..9a920a3e5e4 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -220,6 +220,8 @@
   - 1
 - - repository_update_remote_mirror
   - 1
+- - security_scans
+  - 2
 - - self_monitoring_project_create
   - 2
 - - self_monitoring_project_delete