diff options
| author | Phil Hughes <me@iamphill.com> | 2018-02-27 10:03:19 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-02-27 10:03:19 +0000 |
| commit | 27ca41ac3c9442312f440d78f70628d0ac6826ff (patch) | |
| tree | efde2a9ba11741c94edf288cdae18cd4379a5515 /config/webpack.config.js | |
| parent | 9167989f3e9a8e5ee4c84600102e67d5799a9feb (diff) | |
| parent | a4885b8f37602c399efff028b0a733ef80fbe7ab (diff) | |
| download | gitlab-ce-refactor-commit-show.tar.gz | |
Merge branch 'master' into 'refactor-commit-show'refactor-commit-show
# Conflicts:
# config/webpack.config.js
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 172184128a9..fc3ac01aa93 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -48,9 +48,7 @@ var config = { common: './commons/index.js', common_vue: './vue_shared/vue_resource_interceptor.js', cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', - commit_pipelines: './commit/pipelines/pipelines_bundle.js', environments: './environments/environments_bundle.js', - environments_folder: './environments/folder/environments_folder_bundle.js', filtered_search: './filtered_search/filtered_search_bundle.js', help: './help/help.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', @@ -237,11 +235,9 @@ var config = { name: 'common_vue', chunks: [ 'boards', - 'commit_pipelines', 'cycle_analytics', 'deploy_keys', 'environments', - 'environments_folder', 'filtered_search', 'groups', 'merge_conflicts', |