diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-26 17:27:43 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-26 17:27:43 +0000 |
| commit | 1553a34dbff167978f5dc81cc3a21e0b3b2b2bfa (patch) | |
| tree | 4e844123361aa1791839caffd36557264d73522a | |
| parent | e0195f3369880d3a0b3c5c7e7e5bdee26b785c4a (diff) | |
| parent | a06152540794d247a34826313e7ab466bf5ee8bb (diff) | |
| download | gitlab-ce-1553a34dbff167978f5dc81cc3a21e0b3b2b2bfa.tar.gz | |
Merge branch 'blob-webpack-bundle-remove-tags' into 'master'
Remove webpack bundle tags for blob
See merge request gitlab-org/gitlab-ce!17331
| -rw-r--r-- | app/views/projects/blob/_upload.html.haml | 3 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/app/views/projects/blob/_upload.html.haml b/app/views/projects/blob/_upload.html.haml index b3afd16f900..f1324c61500 100644 --- a/app/views/projects/blob/_upload.html.haml +++ b/app/views/projects/blob/_upload.html.haml @@ -27,6 +27,3 @@ - unless can?(current_user, :push_code, @project) .inline.prepend-left-10 = commit_in_fork_help - -- content_for :page_specific_javascripts do - = webpack_bundle_tag('blob') diff --git a/config/webpack.config.js b/config/webpack.config.js index be827903a6a..05389a2a93f 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -51,7 +51,6 @@ var config = { context: path.join(ROOT_PATH, 'app/assets/javascripts'), entry: { balsamiq_viewer: './blob/balsamiq_viewer.js', - blob: './blob_edit/blob_bundle.js', common: './commons/index.js', common_vue: './vue_shared/vue_resource_interceptor.js', cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', |