kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Robert Speicher 2017-02-02 21:33:43 +00:00
parent 19a39aa726 6dcfc4002e
commit 1c13cea779
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelogs/unreleased/20452-remove-require-from-request_profiler-initializer.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Don't require lib/gitlab/request_profiler/middleware.rb in config/initializers/request_profiler.rb
merge_request:
author:

2
config/initializers/request_profiler.rb
View File

@ -1,5 +1,3 @@
require 'gitlab/request_profiler/middleware'
Rails.application.configure do |config|
config.middleware.use(Gitlab::RequestProfiler::Middleware)
end

3
lib/gitlab/request_profiler/middleware.rb
View File

@ -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