diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-04-21 18:09:41 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-04-21 22:34:04 +0000 |
| commit | 902d91d8783d78758c6f68391471888a373730ea (patch) | |
| tree | 7b300b96c994423bdc1b39d748b91a9c5b9a035a | |
| parent | 20a3c1dfb239149fda751008e867ea32a864e135 (diff) | |
| download | gitlab-ce-902d91d8783d78758c6f68391471888a373730ea.tar.gz | |
Merge branch 'instrument-gitlab-access' into 'master'
Instrument Gitlab::GitAccess/GitAccessWiki
See merge request !3859
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/initializers/metrics.rb | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 08a2dd451ed..9aaffdd2f65 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.7.0 (unreleased) + - Gitlab::GitAccess and Gitlab::GitAccessWiki are now instrumented - The number of InfluxDB points stored per UDP packet can now be configured - Fix error when cross-project label reference used with non-existent project - Transactions for /internal/allowed now have an "action" tag set diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index 22fe51a4534..283936d0efc 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -107,6 +107,10 @@ if Gitlab::Metrics.enabled? config.instrument_methods(const) config.instrument_instance_methods(const) end + + # Instrument the classes used for checking if somebody has push access. + config.instrument_instance_methods(Gitlab::GitAccess) + config.instrument_instance_methods(Gitlab::GitAccessWiki) end GC::Profiler.enable |