diff options
author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 13:34:23 -0600 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 13:34:23 -0600 |
commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /config/routes.rb | |
parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) | |
download | gitlab-ce-6438df3a1e0fb944485cebf07976160184697d72.tar.gz |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/config/routes.rb b/config/routes.rb index 867e5c2ec46..91d1a817175 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -45,7 +45,12 @@ Rails.application.routes.draw do # Sign up scope path: '/users/sign_up', module: :registrations, as: :users_sign_up do - resource :welcome, only: [:show, :update], controller: 'welcome' + resource :welcome, only: [:show, :update], controller: 'welcome' do + Gitlab.ee do + get :trial_getting_started, on: :collection + end + end + resource :experience_level, only: [:show, :update] Gitlab.ee do @@ -87,7 +92,10 @@ Rails.application.routes.draw do # '/-/health' implemented by BasicHealthCheck middleware get 'liveness' => 'health#liveness' get 'readiness' => 'health#readiness' - resources :metrics, only: [:index] + controller :metrics do + get 'metrics', action: :index + get 'metrics/system', action: :system + end mount Peek::Railtie => '/peek', as: 'peek_routes' get 'runner_setup/platforms' => 'runner_setup#platforms' @@ -271,7 +279,8 @@ Rails.application.routes.draw do # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/210024 scope as: 'deprecated' do draw :snippets - draw :profile + + Gitlab::Routing.redirect_legacy_paths(self, :profile) end Gitlab.ee do |