diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-07 15:15:57 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-07 15:15:57 +0000 |
| commit | d0cbef7e8f4faf76b9a528a4629517f29b8c265b (patch) | |
| tree | 90610e3e78f17389bcd601f43b9fbe29723b6034 /config | |
| parent | 32009764527a89708e89fb547ce4086e75cd04d0 (diff) | |
| parent | 2a279143ebbccdbc180619cb29936d35d11b226d (diff) | |
| download | gitlab-ce-d0cbef7e8f4faf76b9a528a4629517f29b8c265b.tar.gz | |
Merge branch '42099-port-push-mirroring-to-ce-ce-port-v-2' into 'master'
CE backport of Backports Push Mirrors to CE
Closes #42099
See merge request gitlab-org/gitlab-ce!18715
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 6 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index f36341cdcaf..5a1be1a8b73 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -174,6 +174,12 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end + resource :mirror, only: [:show, :update] do + member do + post :update_now + end + end + resources :pipelines, only: [:index, :new, :create, :show] do collection do resource :pipelines_settings, path: 'settings', only: [:show, :update] diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 47fbbed44cf..e1e8f36b663 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -73,3 +73,6 @@ - [object_storage, 1] - [plugin, 1] - [pipeline_background, 1] + - [repository_update_remote_mirror, 1] + - [repository_remove_remote, 1] + |