summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-02-16 14:39:14 +0000
committerPhil Hughes <me@iamphill.com>2018-02-16 14:39:14 +0000
commit0433ce3827de76e934d381d565e58fc89836bc80 (patch)
tree9be5adc8216c5cc5977edbfb6e26987307c59d32 /config
parentfeab47e08248af47db2f51dd2c8684f7cf1c1615 (diff)
parent523f1f7cf484bea334c365ca21ab3dd492613b55 (diff)
downloadgitlab-ce-0433ce3827de76e934d381d565e58fc89836bc80.tar.gz
Merge branch 'prometheus-bundle-tag-refactor' into 'master'
Removed prometheus_metrics webpack bundle tag See merge request gitlab-org/gitlab-ce!17175
Diffstat (limited to 'config')
-rw-r--r--config/webpack.config.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index d6cb6a8892f..5ec33533b4f 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -81,7 +81,6 @@ var config = {
pipelines_details: './pipelines/pipeline_details_bundle.js',
profile: './profile/profile_bundle.js',
project_import_gl: './projects/project_import_gitlab_project.js',
- prometheus_metrics: './prometheus_metrics',
protected_branches: './protected_branches',
protected_tags: './protected_tags',
registry_list: './registry/index.js',