diff options
| author | Phil Hughes <me@iamphill.com> | 2017-12-21 15:07:32 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-12-21 15:07:32 +0000 |
| commit | 450317298ce177722b721353a0161d4347536120 (patch) | |
| tree | 4904c49f664a8ad040e593e5ac354a36b7033f60 /config | |
| parent | 889c7081f1c8bea2cd2cf7d50854babd7df92f72 (diff) | |
| parent | 213e91d43926f09eb969859aa2c306eeb127deb4 (diff) | |
| download | gitlab-ce-450317298ce177722b721353a0161d4347536120.tar.gz | |
Merge branch '40040-decouple-multi-file-editor-from-file-list' into 'master'
Resolve "Decouple multi-file editor from file list"
Closes #40040 and #40032
See merge request gitlab-org/gitlab-ce!15430
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 2 | ||||
| -rw-r--r-- | config/webpack.config.js | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb index 016140e0ede..f162043dd5e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -43,6 +43,8 @@ Rails.application.routes.draw do get 'liveness' => 'health#liveness' get 'readiness' => 'health#readiness' post 'storage_check' => 'health#storage_check' + get 'ide' => 'ide#index' + get 'ide/*vueroute' => 'ide#index', format: false resources :metrics, only: [:index] mount Peek::Railtie => '/peek' diff --git a/config/webpack.config.js b/config/webpack.config.js index d8797bbf4d3..6daef243991 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -70,7 +70,7 @@ var config = { protected_branches: './protected_branches', protected_tags: './protected_tags', registry_list: './registry/index.js', - repo: './repo/index.js', + ide: './ide/index.js', sidebar: './sidebar/sidebar_bundle.js', schedule_form: './pipeline_schedules/pipeline_schedule_form_bundle.js', schedules_index: './pipeline_schedules/pipeline_schedules_index_bundle.js', @@ -204,7 +204,7 @@ var config = { 'pipelines', 'pipelines_details', 'registry_list', - 'repo', + 'ide', 'schedule_form', 'schedules_index', 'sidebar', |