diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-05 01:48:21 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-05 01:48:21 +0300 |
| commit | 12fbce2eacdfbbc9bca7f7eaca6e5679ee1aaffd (patch) | |
| tree | 055c994736a0408af7c6b4c5ff6ca37ec65c336c /config/webpack.config.js | |
| parent | 1bf694fcb95c978e8cf32664b3ced186e7a7d850 (diff) | |
| parent | 79dc817183bf1480e72016c3e6a78ac0e57d8c96 (diff) | |
Merge branch 'master' into 'add-sentry-js-again-with-vue'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'config/webpack.config.js')
| -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 ea699b1ecba..c005ee0df2a 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', @@ -123,6 +124,7 @@ var config = { 'boards', 'commit_pipelines', 'cycle_analytics', + 'deploy_keys', 'diff_notes', 'environments', 'environments_folder', |