diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/concerns/with_performance_bar.rb | 2 | ||||
| -rw-r--r-- | app/helpers/nav_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/layouts/_head.html.haml | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/concerns/with_performance_bar.rb b/app/controllers/concerns/with_performance_bar.rb index ed253042701..d08f6e17f88 100644 --- a/app/controllers/concerns/with_performance_bar.rb +++ b/app/controllers/concerns/with_performance_bar.rb @@ -3,6 +3,8 @@ module WithPerformanceBar included do include Peek::Rblineprof::CustomControllerHelpers + alias_method :performance_bar_enabled?, :peek_enabled? + helper_method :performance_bar_enabled? end def peek_enabled? diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index e589ed4e56d..4bb04867e0f 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -23,7 +23,7 @@ module NavHelper def nav_header_class class_name = '' class_name << " with-horizontal-nav" if defined?(nav) && nav - class_name << " with-peek" if peek_enabled? + class_name << " with-peek" if performance_bar_enabled? class_name end diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index abb6dc2e9f3..3d3e29733ff 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -30,7 +30,7 @@ = stylesheet_link_tag "application", media: "all" = stylesheet_link_tag "print", media: "print" = stylesheet_link_tag "test", media: "all" if Rails.env.test? - = stylesheet_link_tag 'peek' if peek_enabled? + = stylesheet_link_tag 'peek' if performance_bar_enabled? - if show_new_nav? = stylesheet_link_tag "new_nav", media: "all" @@ -44,7 +44,7 @@ = 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 'peek' if peek_enabled? + = webpack_bundle_tag 'peek' if performance_bar_enabled? - if content_for?(:page_specific_javascripts) = yield :page_specific_javascripts |