diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2017-05-05 02:51:18 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-05-05 02:51:18 +0300 |
| commit | 7fd42698aae14c8d0a064716f90274f1de54e496 (patch) | |
| tree | 552d6f47cde2ab29571b09fdc5a97c3b1dc70ee6 /config/webpack.config.js | |
| parent | b396668ec55fb866ef578e5f0e60df8b13519613 (diff) | |
| parent | bacf652a3794c4da71312982b7617542363c1441 (diff) | |
Merge branch 'master' into 28433-internationalise-cycle-analytics-page
Conflicts:
lib/gitlab/cycle_analytics/review_stage.rb
lib/gitlab/cycle_analytics/staging_stage.rb
lib/gitlab/cycle_analytics/test_stage.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 c5117bb81ba..3abdb6c2d76 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', @@ -128,6 +129,7 @@ var config = { 'boards', 'commit_pipelines', 'cycle_analytics', + 'deploy_keys', 'diff_notes', 'environments', 'environments_folder', |