Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

2 files changed, 14 insertions, 0 deletions

diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index ed1afc9efa3..6b786fc82b3 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -145,6 +145,8 @@ namespace :admin do
     delete :delete_self_monitoring_project
     get :status_delete_self_monitoring_project
 
+    get :service_usage_data
+
     resource :appearances, only: [:show, :create, :update], path: 'appearance', module: 'application_settings' do
       member do
         get :preview_sign_in
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 702ef64a2ca..8536ec9fc05 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -158,6 +158,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
             get 'milestones'
             get 'commands'
             get 'snippets'
+            get 'contacts'
           end
         end
 
@@ -464,6 +465,16 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         namespace :integrations do
           resource :shimo, only: [:show]
         end
+
+        get :planning_hierarchy
+
+        resources :badges, only: [] do
+          collection do
+            constraints format: /svg/ do
+              get :release
+            end
+          end
+        end
       end
       # End of the /-/ scope.
 
@@ -580,6 +591,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
 
       scope :service_ping, controller: :service_ping do
         post :web_ide_clientside_preview # rubocop:todo Cop/PutProjectRoutesUnderScope
+        post :web_ide_clientside_preview_success # rubocop:todo Cop/PutProjectRoutesUnderScope
         post :web_ide_pipelines_count # rubocop:todo Cop/PutProjectRoutesUnderScope
       end