diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 00:09:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 00:09:02 +0300 |
commit | 76623c12c136f43f24c3966ed4b469e2c0b434b7 (patch) | |
tree | 7c5ec884c25e03e4fea131a4d112a9d0ccfd59b8 /config | |
parent | b042382bbf5a4977c5b5c6b0a9a33f4e8ca8d16d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/project.rb | 11 | ||||
-rw-r--r-- | config/routes/repository.rb | 11 | ||||
-rw-r--r-- | config/sidekiq_queues.yml | 2 |
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 |