diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-02-02 19:21:52 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-02-02 19:21:52 +0000 |
| commit | ee600a84d29d1ecbfdb3e9cb1a55c610ed65ab10 (patch) | |
| tree | cd5bf2cd2d26a610d12d5fcf4d607e9528684344 /app/views/layouts | |
| parent | a58f8c32c62bcf5824d1fe1d0de53e9bda974d65 (diff) | |
| parent | 65407c3878159add9113010046b55068261fec10 (diff) | |
| download | gitlab-ce-ee600a84d29d1ecbfdb3e9cb1a55c610ed65ab10.tar.gz | |
Merge branch 'webpack-auto-config' into 'master'
Automatically Generate Webpack Entry Points
See merge request gitlab-org/gitlab-ce!16865
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/_head.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 488b706e6a6..0c979109b3f 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -47,6 +47,8 @@ - if content_for?(:page_specific_javascripts) = yield :page_specific_javascripts + = webpack_controller_bundle_tags + = yield :project_javascripts = csrf_meta_tags |