diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-02-20 19:51:42 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-02-20 19:51:42 +0000 |
| commit | 520f407250470b94161724355208cb4ca073746c (patch) | |
| tree | 747d293643c80c1f3cd7174c36dec43a4bcd6efd /config | |
| parent | 0e2ba2326ca3ff499138cabb563a159b48631771 (diff) | |
| parent | e345406cbc30e729d08be2fee06db331e69438b6 (diff) | |
| download | gitlab-ce-520f407250470b94161724355208cb4ca073746c.tar.gz | |
Merge branch 'dispatcher-mr-haml' into 'master'
Add dispatcher imports for bundles used in merge request show path
See merge request gitlab-org/gitlab-ce!17163
Diffstat (limited to 'config')
| -rw-r--r-- | config/webpack.config.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 31b29075d62..fe2111d1a5c 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -63,7 +63,6 @@ var config = { environments_folder: './environments/folder/environments_folder_bundle.js', filtered_search: './filtered_search/filtered_search_bundle.js', help: './help/help.js', - how_to_merge: './how_to_merge.js', issue_show: './issue_show/index.js', job_details: './jobs/job_details_bundle.js', locale: './locale/index.js', |