summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaco Guzman <pacoguzmanp@gmail.com>2016-07-04 12:20:57 +0200
committerPaco Guzman <pacoguzmanp@gmail.com>2016-07-04 12:20:57 +0200
commit90dc6f1211ab1a9d10c6799d90310dde79581d62 (patch)
treec54dfe863e4f9dd56ff3b4b59dd892ed3753fcd4
parent021b6aef94b3398ab5603b4c11afd4c6d8432795 (diff)
downloadgitlab-ce-18593-autofilter-rinku-instrumentation.tar.gz
-rw-r--r--CHANGELOG1
-rw-r--r--config/initializers/metrics.rb2
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5f593336895..bd4a919f039 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,7 @@ v 8.10.0 (unreleased)
- Better caching of git calls on ProjectsController#show.
- Add API endpoint for a group issues !4520 (mahcsig)
- Add Bugzilla integration !4930 (iamtjg)
+ - Instrument Rinku usage
- Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab
- Allow [ci skip] to be in any case and allow [skip ci]. !4785 (simon_w)
- Add basic system information like memory and disk usage to the admin panel
diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb
index 44601f2b2bd..c4266ab8ba5 100644
--- a/config/initializers/metrics.rb
+++ b/config/initializers/metrics.rb
@@ -135,6 +135,8 @@ if Gitlab::Metrics.enabled?
config.instrument_instance_methods(Rouge::Plugins::Redcarpet)
config.instrument_instance_methods(Rouge::Formatters::HTMLGitlab)
+
+ config.instrument_methods(Rinku)
end
GC::Profiler.enable