summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-06-28 15:49:42 +0000
committerTim Zallmann <tzallmann@gitlab.com>2017-06-28 15:49:42 +0000
commit5870fc5daf0b96c26479ee6f7601bc6e8a243c24 (patch)
treef9a3a417bbe37fef74da7d8db83252b3c7c54acb /config
parent9ef6d028a12521c1c458680bccde24ccfdddcb65 (diff)
parentdbec39ab863367479984858a0383197f36d7a416 (diff)
downloadgitlab-ce-5870fc5daf0b96c26479ee6f7601bc6e8a243c24.tar.gz
Merge branch 'cherry-pick-5ea675be' into 'master'
Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-review-branch' See merge request !12454
Diffstat (limited to 'config')
-rw-r--r--config/webpack.config.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 2e8c94655c1..90ef6a5448b 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -163,6 +163,7 @@ var config = {
'issue_show',
'job_details',
'merge_conflicts',
+ 'monitoring',
'notebook_viewer',
'pdf_viewer',
'pipelines',