Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 0 deletions

diff --git a/config/routes/project.rb b/config/routes/project.rb
index a08803fd1d8..5dda803cdfe 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -306,6 +306,13 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           resources :projects, only: :index
         end
 
+        resources :product_analytics, only: [:index] do
+          collection do
+            get :setup
+            get :test
+          end
+        end
+
         resources :error_tracking, only: [:index], controller: :error_tracking do
           collection do
             get ':issue_id/details',