summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-13 16:05:30 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-13 16:05:30 +0200
commitf6de5937e302493db2b9bcef7812ed36e1e049e6 (patch)
tree5cd95c593013e5d386f623e8dc3af82e48fc73a7 /config/initializers
parentc534d2e89ed00ff98c83a197674b5ac66a8aca93 (diff)
parent57ebd3996eb5d8ff85c5899c7a7f351272655562 (diff)
downloadgitlab-ce-f6de5937e302493db2b9bcef7812ed36e1e049e6.tar.gz
Merge remote-tracking branch 'origin/master' into artifacts-expire-date
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/metrics.rb17
1 files changed, 11 insertions, 6 deletions
diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index 2673093b96a..f6509ee43f1 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -96,13 +96,18 @@ if Gitlab::Metrics.enabled?
config.instrument_instance_methods(const)
end
- # Instruments all Banzai filters
- Dir[Rails.root.join('lib', 'banzai', 'filter', '*.rb')].each do |file|
- klass = File.basename(file, File.extname(file)).camelize
- const = Banzai::Filter.const_get(klass)
+ # Instruments all Banzai filters and reference parsers
+ {
+ Filter: Rails.root.join('lib', 'banzai', 'filter', '*.rb'),
+ ReferenceParser: Rails.root.join('lib', 'banzai', 'reference_parser', '*.rb')
+ }.each do |const_name, path|
+ Dir[path].each do |file|
+ klass = File.basename(file, File.extname(file)).camelize
+ const = Banzai.const_get(const_name).const_get(klass)
- config.instrument_methods(const)
- config.instrument_instance_methods(const)
+ config.instrument_methods(const)
+ config.instrument_instance_methods(const)
+ end
end
config.instrument_methods(Banzai::Renderer)