diff options
author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-16 15:30:18 +0300 |
---|---|---|
committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-16 15:30:18 +0300 |
commit | ea7c7769570f2c9a371ace7a655082a95457aa5f (patch) | |
tree | 7912ebf580498a662f5fbba1085faf6d5b0e630f /config | |
parent | edecab2041c1be24f430bc4ab6615116273b6659 (diff) | |
parent | 13615ef80da5b53c4c605878011e5998daf314f2 (diff) |
Merge branch 'fe-paginated-environments-api' into 'paginate-environments-bundle'
Integrate with new environments API
See merge request !8954
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/project.rb | 4 | ||||
-rw-r--r-- | config/webpack.config.js | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 2ac98cf3842..84f123ff717 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -156,6 +156,10 @@ constraints(ProjectUrlConstrainer.new) do get :terminal get '/terminal.ws/authorize', to: 'environments#terminal_websocket_authorize', constraints: { format: nil } end + + collection do + get :folder, path: 'folders/:id' + end end resource :cycle_analytics, only: [:show] diff --git a/config/webpack.config.js b/config/webpack.config.js index e63775e43ce..8d981c76c1a 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -22,6 +22,7 @@ var config = { commit_pipelines: './commit/pipelines/pipelines_bundle.js', diff_notes: './diff_notes/diff_notes_bundle.js', environments: './environments/environments_bundle.js', + environments_folder: './environments/folder/environments_folder_bundle.js', filtered_search: './filtered_search/filtered_search_bundle.js', graphs: './graphs/graphs_bundle.js', issuable: './issuable/issuable_bundle.js', |