diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-04 18:30:41 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-05-04 18:30:41 +0000 |
| commit | 7a66cd688aea6bd7d1103d0024204a1470153975 (patch) | |
| tree | d3f4b3774d2b8673209304705a23462414490586 /config | |
| parent | 97a9a38b689e2ff7ab6dcd04d8bae65ef778e411 (diff) | |
| parent | 136baeda508ddf46f6d91c03d4128b2ee890d205 (diff) | |
| download | gitlab-ce-7a66cd688aea6bd7d1103d0024204a1470153975.tar.gz | |
Merge branch 'deploy-keys-load-async' into 'master'
Deploy keys load async
Closes #29667
See merge request !10973
Diffstat (limited to 'config')
| -rw-r--r-- | config/webpack.config.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 0ec9e48845e..239bb5ec436 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -26,6 +26,7 @@ var config = { common_d3: ['d3'], cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', commit_pipelines: './commit/pipelines/pipelines_bundle.js', + deploy_keys: './deploy_keys/index.js', diff_notes: './diff_notes/diff_notes_bundle.js', environments: './environments/environments_bundle.js', environments_folder: './environments/folder/environments_folder_bundle.js', @@ -122,6 +123,7 @@ var config = { 'boards', 'commit_pipelines', 'cycle_analytics', + 'deploy_keys', 'diff_notes', 'environments', 'environments_folder', |