summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-08-27 12:40:44 +0100
committerSean McGivern <sean@gitlab.com>2019-08-28 17:25:02 +0100
commitf9c456bd0c34002952fa4ac812068b38258b108d (patch)
tree2584e356752088e5d80cb544fda91d311af57457 /app/helpers
parent7f102819a56b55607e657447b51d2eeb45b2fe94 (diff)
downloadgitlab-ce-f9c456bd0c34002952fa4ac812068b38258b108d.tar.gz
Make performance bar enabled checks consistent
Previously, we called the `peek_enabled?` method like so: prepend_before_action :set_peek_request_id, if: :peek_enabled? Now we don't have a `set_peek_request_id` method, so we don't need that line. However, the `peek_enabled?` part had a side-effect: it would also populate the request store cache for whether the performance bar was enabled for the current request or not. This commit makes that side-effect explicit, and replaces all uses of `peek_enabled?` with the more explicit `Gitlab::PerformanceBar.enabled_for_request?`. There is one spec that still sets `SafeRequestStore[:peek_enabled]` directly, because it is contrasting behaviour with and without a request store enabled. The upshot is: 1. We still set the value in one place. We make it more explicit that that's what we're doing. 2. Reading that value uses a consistent method so it's easier to find in future.
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/performance_bar_helper.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/helpers/performance_bar_helper.rb b/app/helpers/performance_bar_helper.rb
index 7518cec160c..b225e4206a9 100644
--- a/app/helpers/performance_bar_helper.rb
+++ b/app/helpers/performance_bar_helper.rb
@@ -1,9 +1,7 @@
# frozen_string_literal: true
module PerformanceBarHelper
- # This is a hack since using `alias_method :performance_bar_enabled?, :peek_enabled?`
- # in WithPerformanceBar breaks tests (but works in the browser).
def performance_bar_enabled?
- peek_enabled?
+ Gitlab::PerformanceBar.enabled_for_request?
end
end