From aaf03c0c4819a5839f2dbd5003a7ce066b68ee53 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 23 Jan 2018 09:17:29 +0000 Subject: correctly imports performance bar --- app/views/layouts/_head.html.haml | 1 - 1 file changed, 1 deletion(-) (limited to 'app/views/layouts/_head.html.haml') diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 1597621fa78..ea13a5e6d62 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -43,7 +43,6 @@ = webpack_bundle_tag "main" = webpack_bundle_tag "raven" if current_application_settings.clientside_sentry_enabled = webpack_bundle_tag "test" if Rails.env.test? - = webpack_bundle_tag 'performance_bar' if performance_bar_enabled? - if content_for?(:page_specific_javascripts) = yield :page_specific_javascripts -- cgit v1.2.1 From dd75c337e5ee036fca8188d5b7adbf6e7725570f Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 1 Feb 2018 16:01:36 -0600 Subject: update webpack helper to automatically include route-based entry points --- app/views/layouts/_head.html.haml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/views/layouts/_head.html.haml') diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index ea13a5e6d62..1403c8329c8 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -41,6 +41,7 @@ = webpack_bundle_tag "webpack_runtime" = webpack_bundle_tag "common" = webpack_bundle_tag "main" + = webpack_controller_bundle_tags = webpack_bundle_tag "raven" if current_application_settings.clientside_sentry_enabled = webpack_bundle_tag "test" if Rails.env.test? -- cgit v1.2.1 From ac85d98cc3c08c56ae02158effa1e59739ba3485 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 1 Feb 2018 21:34:01 -0600 Subject: move auto-generated bundle script tags after manual page-specific webpack bundles --- app/views/layouts/_head.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/views/layouts/_head.html.haml') diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 1403c8329c8..3fbdb4b9463 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -41,13 +41,14 @@ = webpack_bundle_tag "webpack_runtime" = webpack_bundle_tag "common" = webpack_bundle_tag "main" - = webpack_controller_bundle_tags = webpack_bundle_tag "raven" if current_application_settings.clientside_sentry_enabled = webpack_bundle_tag "test" if Rails.env.test? - if content_for?(:page_specific_javascripts) = yield :page_specific_javascripts + = webpack_controller_bundle_tags + = yield :project_javascripts = csrf_meta_tags -- cgit v1.2.1 From eaada9d7066a20b5af815f723e09cde60a5c8c10 Mon Sep 17 00:00:00 2001 From: Mario de la Ossa Date: Fri, 2 Feb 2018 18:39:55 +0000 Subject: use Gitlab::UserSettings directly as a singleton instead of including/extending it --- app/views/layouts/_head.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/layouts/_head.html.haml') diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index ea13a5e6d62..488b706e6a6 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -41,7 +41,7 @@ = webpack_bundle_tag "webpack_runtime" = webpack_bundle_tag "common" = webpack_bundle_tag "main" - = webpack_bundle_tag "raven" if current_application_settings.clientside_sentry_enabled + = webpack_bundle_tag "raven" if Gitlab::CurrentSettings.clientside_sentry_enabled = webpack_bundle_tag "test" if Rails.env.test? - if content_for?(:page_specific_javascripts) -- cgit v1.2.1