diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
| commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
| tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /config/routes.rb | |
| parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) | |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/config/routes.rb b/config/routes.rb index 6cfbb969acb..27313854233 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,6 @@ require 'sidekiq/web' require 'sidekiq/cron/web' -require 'product_analytics/collector_app' InitializerConnections.with_disabled_database_connections do Rails.application.routes.draw do @@ -56,7 +55,9 @@ InitializerConnections.with_disabled_database_connections do match '/oauth/token' => 'oauth/tokens#create', via: :options match '/oauth/revoke' => 'oauth/tokens#revoke', via: :options - match '/-/jira_connect/oauth_application_id' => 'jira_connect/oauth_application_ids#show', via: :options + match '/-/jira_connect/oauth_application_id' => 'jira_connect/cors_preflight_checks#index', via: :options + match '/-/jira_connect/subscriptions/:id' => 'jira_connect/cors_preflight_checks#index', via: :options + match '/-/jira_connect/installations' => 'jira_connect/cors_preflight_checks#index', via: :options # Sign up scope path: '/users/sign_up', module: :registrations, as: :users_sign_up do @@ -217,9 +218,6 @@ InitializerConnections.with_disabled_database_connections do # Deprecated route for permanent failures # https://gitlab.com/gitlab-org/gitlab/-/issues/362606 post '/members/mailgun/permanent_failures' => 'mailgun/webhooks#process_webhook' - - # Product analytics collector - match '/collector/i', to: ProductAnalytics::CollectorApp.new, via: :all end # End of the /-/ scope. |