diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /config/routes.rb | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/config/routes.rb b/config/routes.rb index 90a26c0a20f..38030a24cb5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -50,6 +50,7 @@ Rails.application.routes.draw do resource :welcome, only: [:show, :update], controller: 'welcome' do Gitlab.ee do get :trial_getting_started, on: :collection + get :trial_onboarding_board, on: :collection end end @@ -57,6 +58,7 @@ Rails.application.routes.draw do Gitlab.ee do resources :groups, only: [:new, :create] + resources :group_invites, only: [:new, :create] resources :projects, only: [:new, :create] end end @@ -130,8 +132,24 @@ Rails.application.routes.draw do # UserCallouts resources :user_callouts, only: [:create] - get 'ide' => 'ide#index' - get 'ide/*vueroute' => 'ide#index', format: false + scope :ide, as: :ide, format: false do + get '/', to: 'ide#index' + get '/project', to: 'ide#index' + + scope path: 'project/:project_id', as: :project, constraints: { project_id: Gitlab::PathRegex.full_namespace_route_regex } do + %w[edit tree blob].each do |action| + get "/#{action}", to: 'ide#index' + get "/#{action}/*branch/-/*path", to: 'ide#index' + get "/#{action}/*branch/-", to: 'ide#index' + get "/#{action}/*branch", to: 'ide#index' + end + + get '/merge_requests/:merge_request_id', to: 'ide#index', constraints: { merge_request_id: /\d+/ } + get '/', to: 'ide#index' + end + end + + resource :projects draw :operations draw :jira_connect @@ -165,9 +183,6 @@ Rails.application.routes.draw do end end - # Notification settings - resources :notification_settings, only: [:create, :update] - resources :invites, only: [:show], constraints: { id: /[A-Za-z0-9_-]+/ } do member do post :accept |