From 2e06800bfdb1fa46602beffce6ea8fb282e8a29a Mon Sep 17 00:00:00 2001
From: Ahmad Sherif <me@ahmadsherif.com>
Date: Mon, 1 Aug 2016 14:23:41 +0200
Subject: [PATCH] Fix RequestProfiler::Middleware error when code is reloaded
 in development

Closes #20452
---
 CHANGELOG                                 | 1 +
 config/initializers/request_profiler.rb   | 2 ++
 lib/gitlab/request_profiler/middleware.rb | 1 +
 3 files changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 387006eec4ef5..d25ff7da27fb2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -40,6 +40,7 @@ v 8.11.0 (unreleased)
   - Change requests_profiles resource constraint to catch virtually any file
   - Reduce number of queries made for merge_requests/:id/diffs
   - Sensible state specific default sort order for issues and merge requests !5453 (tomb0y)
+  - Fix RequestProfiler::Middleware error when code is reloaded in development
 
 v 8.10.3 (unreleased)
   - Fix hooks missing on imported GitLab projects
diff --git a/config/initializers/request_profiler.rb b/config/initializers/request_profiler.rb
index fb5a7b8372e55..a9aa802681a02 100644
--- a/config/initializers/request_profiler.rb
+++ b/config/initializers/request_profiler.rb
@@ -1,3 +1,5 @@
+require 'gitlab/request_profiler/middleware'
+
 Rails.application.configure do |config|
   config.middleware.use(Gitlab::RequestProfiler::Middleware)
 end
diff --git a/lib/gitlab/request_profiler/middleware.rb b/lib/gitlab/request_profiler/middleware.rb
index 8da8b75497540..0c54f2dd71f80 100644
--- a/lib/gitlab/request_profiler/middleware.rb
+++ b/lib/gitlab/request_profiler/middleware.rb
@@ -1,4 +1,5 @@
 require 'ruby-prof'
+require 'gitlab/request_profiler'
 
 module Gitlab
   module RequestProfiler
-- 
GitLab