diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-07-31 10:23:50 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-07-31 10:23:50 +0200 |
| commit | 95f9d6d83bcb7a9f45601f828c34301e536fc195 (patch) | |
| tree | ed5447c85eb35ac9b7a363dd5a83514578c2fb3e /config/webpack.config.js | |
| parent | c92881c394a482bdb6d3f0f0a5f3cc95d5eed1fc (diff) | |
| parent | 6fe736f2c927340ed8cf827080db781f7c8adcdf (diff) | |
| download | gitlab-ce-95f9d6d83bcb7a9f45601f828c34301e536fc195.tar.gz | |
Merge branch 'master' into issue-discussions-refactor
# Conflicts:
# app/controllers/concerns/notes_actions.rb
# spec/features/task_lists_spec.rb
# spec/support/features/issuable_slash_commands_shared_examples.rb
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index bcc64b1fccd..1bcbad3a60d 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -42,6 +42,7 @@ var config = { group: './group.js', groups: './groups/index.js', groups_list: './groups_list.js', + how_to_merge: './how_to_merge.js', issue_show: './issue_show/index.js', integrations: './integrations', job_details: './jobs/job_details_bundle.js', @@ -67,7 +68,6 @@ var config = { stl_viewer: './blob/stl_viewer.js', terminal: './terminal/terminal_bundle.js', u2f: ['vendor/u2f'], - users: './users/index.js', raven: './raven/index.js', vue_merge_request_widget: './vue_merge_request_widget/index.js', test: './test.js', @@ -186,7 +186,6 @@ var config = { name: 'common_d3', chunks: [ 'graphs', - 'users', 'monitoring', ], }), |