diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2016-06-08 10:31:33 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2016-06-08 10:31:33 +0200 |
| commit | bebe110dff812bd08fa7042e92cb8ae3c79e3bb8 (patch) | |
| tree | 0812014f8eac80604be571cedd927c727a84f388 /config/initializers | |
| parent | ff7c4e588ab4f7a397963d43becbe00d1bb584a1 (diff) | |
| parent | 915ad255cdc7afa9a44ba24eed62f28184e81836 (diff) | |
| download | gitlab-ce-bebe110dff812bd08fa7042e92cb8ae3c79e3bb8.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-http-controller
Conflicts:
lib/gitlab/workhorse.rb
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/inflections.rb | 4 | ||||
| -rw-r--r-- | config/initializers/metrics.rb | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 9e8b0131f8f..3d1a41a4652 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -8,3 +8,7 @@ # inflect.irregular 'person', 'people' # inflect.uncountable %w( fish sheep ) # end +# +ActiveSupport::Inflector.inflections do |inflect| + inflect.uncountable %w(award_emoji) +end diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index 0c788714714..2673093b96a 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -121,6 +121,13 @@ if Gitlab::Metrics.enabled? config.instrument_instance_methods(Gitlab::GitAccessWiki) config.instrument_instance_methods(API::Helpers) + + config.instrument_instance_methods(RepositoryCheck::SingleRepositoryWorker) + # Iterate over each non-super private instance method to keep up to date if + # internals change + RepositoryCheck::SingleRepositoryWorker.private_instance_methods(false).each do |method| + config.instrument_instance_method(RepositoryCheck::SingleRepositoryWorker, method) + end end GC::Profiler.enable |