Merge branch 'zj-perf-bar-default-dev' into 'master'

Enable the performance bar in dev environments Closes #40989 See merge request gitlab-org/gitlab-ce!15913
2017-12-13 16:09:11 +00:00 · 2017-12-13 16:09:11 +00:00 · 87f7309c5d
parent f15082fb6b b6bd77f5dd
commit 87f7309c5d
1 changed files with 1 additions and 0 deletions
--- a/app/controllers/concerns/with_performance_bar.rb
+++ b/app/controllers/concerns/with_performance_bar.rb
@ -6,6 +6,7 @@ module WithPerformanceBar
  end

  def peek_enabled?
+    return true if Rails.env.development?
    return false unless Gitlab::PerformanceBar.enabled?(current_user)

    if RequestStore.active?