diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-08-03 14:13:06 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-08-03 14:13:06 +0300 |
| commit | 2197ee02e95ade455785cc1769bf3a40a082a799 (patch) | |
| tree | 387a303a1bce6e5002c78a6d41c904ceffe2b357 /config | |
| parent | d0ffbd18fa5be4e90d150bc617d0cc7eb3c8720b (diff) | |
| parent | 1018ab0516fd94d1ffbc05a0ad8499947dd9630d (diff) | |
Merge branch 'master' into ide
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 2 | ||||
| -rw-r--r-- | config/webpack.config.js | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index e9bf2df490f..73a68c6da1b 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -282,7 +282,7 @@ production: &base # # Example: '/etc/ca.pem' # - ca_cert: '' + ca_file: '' # Specifies the SSL version for OpenSSL to use, if the OpenSSL default # is not appropriate. diff --git a/config/webpack.config.js b/config/webpack.config.js index 2748f5f2afe..d3dc512beca 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -40,6 +40,8 @@ var config = { environments_folder: './environments/folder/environments_folder_bundle.js', filtered_search: './filtered_search/filtered_search_bundle.js', graphs: './graphs/graphs_bundle.js', + graphs_charts: './graphs/graphs_charts.js', + graphs_show: './graphs/graphs_show.js', group: './group.js', groups: './groups/index.js', groups_list: './groups_list.js', @@ -72,9 +74,12 @@ var config = { stl_viewer: './blob/stl_viewer.js', terminal: './terminal/terminal_bundle.js', u2f: ['vendor/u2f'], + ui_development_kit: './ui_development_kit.js', + users: './users/index.js', raven: './raven/index.js', vue_merge_request_widget: './vue_merge_request_widget/index.js', test: './test.js', + two_factor_auth: './two_factor_auth.js', performance_bar: './performance_bar.js', webpack_runtime: './webpack.js', }, |