diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-03-02 20:18:29 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-03-02 20:18:29 +0300 |
| commit | 98fecb5f8e64c4c64c96d065bc342d986140367e (patch) | |
| tree | 56ec4b668a55db09c30c87bb993e293c22585c6c /app/views | |
| parent | e17d8ad8476148daedb6dcb3c0c7aee2db4db60d (diff) | |
| parent | eefd17437c201418b7336493eb320a129a5b8abe (diff) | |
Merge branch 'remove-test-bundle' into 'master'
Remove the "test" bundle and apply it conditionally within main.js
See merge request gitlab-org/gitlab-ce!17472
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/_head.html.haml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 0c979109b3f..b981b5fdafa 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -42,7 +42,6 @@ = webpack_bundle_tag "common" = webpack_bundle_tag "main" = webpack_bundle_tag "raven" if Gitlab::CurrentSettings.clientside_sentry_enabled - = webpack_bundle_tag "test" if Rails.env.test? - if content_for?(:page_specific_javascripts) = yield :page_specific_javascripts |