diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-18 12:29:50 -0500 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-18 12:29:50 -0500 |
| commit | 2bea20b8ef4bb4c0577bfe68bb77f96958e164d2 (patch) | |
| tree | 0ca455b6831cae78c7cb3f5aba534c40cea2b5ec | |
| parent | 98a7486ba76eb7235174b4b6f74794c664df29da (diff) | |
| parent | 28eea9bdfd0b28ad044f76bd4fcf988329ca9921 (diff) | |
| download | gitlab-ce-docker-registry-view.tar.gz | |
Merge branch 'master' into docker-registry-viewdocker-registry-view
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/initializers/metrics.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index e1252d4b947..20e2fcb806c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -57,6 +57,7 @@ v 8.8.0 (unreleased) - Redesign navigation for profile and group pages - Add counter metrics for rails cache - Import pull requests from GitHub where the source or target branches were removed + - All Grape API helpers are now instrumented v 8.7.6 - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko) diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index b2d08d87bac..2338916e9da 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -118,6 +118,8 @@ if Gitlab::Metrics.enabled? # Instrument the classes used for checking if somebody has push access. config.instrument_instance_methods(Gitlab::GitAccess) config.instrument_instance_methods(Gitlab::GitAccessWiki) + + config.instrument_instance_methods(API::Helpers) end GC::Profiler.enable |