diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-02-03 00:33:43 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-02-03 00:33:43 +0300 |
| commit | 1c13cea779b584a9f053e67e1cb6b77d103287dc (patch) | |
| tree | 8cfa26d7eaf9e42443405f68f54830054d372a8f /lib | |
| parent | 19a39aa726a5d5ec243958b5b861b83989176374 (diff) | |
| parent | 6dcfc4002e24c54c2f60b53bb2761a300bf68735 (diff) | |
Merge branch '20452-remove-require-from-request_profiler-initializer' into 'master'
Don't require lib/gitlab/request_profiler/middleware.rb in config/initializers/request_profiler.rb
Closes #20452
See merge request !8927
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/request_profiler/middleware.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/request_profiler/middleware.rb b/lib/gitlab/request_profiler/middleware.rb index 786e1d49f5e..ef42b0557e0 100644 --- a/lib/gitlab/request_profiler/middleware.rb +++ b/lib/gitlab/request_profiler/middleware.rb @@ -1,5 +1,4 @@ require 'ruby-prof' -require_dependency 'gitlab/request_profiler' module Gitlab module RequestProfiler @@ -20,7 +19,7 @@ module Gitlab header_token = env['HTTP_X_PROFILE_TOKEN'] return unless header_token.present? - profile_token = RequestProfiler.profile_token + profile_token = Gitlab::RequestProfiler.profile_token return unless profile_token.present? header_token == profile_token |