Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2021-01-20 22:34:23 +0300
committerRobert Speicher <rspeicher@gmail.com>2021-01-20 22:34:23 +0300
commit6438df3a1e0fb944485cebf07976160184697d72 (patch)
tree00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /config/routes
parent42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff)
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'config/routes')
-rw-r--r--config/routes/group.rb2
-rw-r--r--config/routes/import.rb1
2 files changed, 3 insertions, 0 deletions
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 38c04369d2f..012d5926872 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -49,6 +49,8 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
post :reset
end
end
+
+ resources :packages_and_registries, only: [:index]
end
resource :variables, only: [:show, :update]
diff --git a/config/routes/import.rb b/config/routes/import.rb
index 6c99b0320de..5f94fb8d058 100644
--- a/config/routes/import.rb
+++ b/config/routes/import.rb
@@ -63,6 +63,7 @@ namespace :import do
resource :bulk_imports, only: [:create] do
post :configure
get :status
+ get :realtime_changes
end
resource :manifest, only: [:create, :new], controller: :manifest do