diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-08-12 15:23:37 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-08-12 15:23:37 +0000 |
| commit | ec73abcd782ba9be95db62ecede09db7fe783aab (patch) | |
| tree | de968d196a742e60060e7e273d5d81d02a018c3d | |
| parent | 283b2c0b15bbd39136f601f595157033850dd5a8 (diff) | |
| parent | e0fc43ebe2d174c97062e79de36161914dafbb66 (diff) | |
| download | gitlab-ce-ec73abcd782ba9be95db62ecede09db7fe783aab.tar.gz | |
Merge branch 'instrument-project-visible-to-user' into 'master'
Instrument Project.visible_to_user
## What does this MR do?
This MR instruments `Project.visible_to_user`
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
The method in question was not instrumented due to being a Rails scope.
## What are the relevant issue numbers?
#12425
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5793
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/initializers/metrics.rb | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 28834c1129a..6fe1720796d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -25,6 +25,7 @@ v 8.11.0 (unreleased) - Pre-create all builds for a Pipeline when the new Pipeline is created !5295 - Fix of 'Commits being passed to custom hooks are already reachable when using the UI' - Show member roles to all users on members page + - Project.visible_to_user is instrumented again - Fix awardable button mutuality loading spinners (ClemMakesApps) - Add support for using RequestStore within Sidekiq tasks via SIDEKIQ_REQUEST_STORE env variable - Optimize maximum user access level lookup in loading of notes diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index cc8208db3c1..52522e099e7 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -148,6 +148,9 @@ if Gitlab::Metrics.enabled? config.instrument_methods(Gitlab::Highlight) config.instrument_instance_methods(Gitlab::Highlight) + + # This is a Rails scope so we have to instrument it manually. + config.instrument_method(Project, :visible_to_user) end GC::Profiler.enable |