Skip to content

G
gitlab-ce
Commit dd3cb143 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in config/initializers/8_metrics.rb 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent f85c124a
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
config/initializers/8_metrics.rb
View file @ dd3cb143
...@@ -212,13 +212,10 @@ if Gitlab::Metrics.enabled? ...@@ -212,13 +212,10 @@ if Gitlab::Metrics.enabled?
GC::Profiler.enable GC::Profiler.enable
Gitlab::Metrics::Samplers::InfluxSampler.initialize_instance.start Gitlab::Metrics::Samplers::InfluxSampler.initialize_instance.start
<<<<<<< HEAD
Gitlab::Metrics::Instrumentation.configure do |config| Gitlab::Metrics::Instrumentation.configure do |config|
config.instrument_instance_methods(Gitlab::InsecureKeyFingerprint) config.instrument_instance_methods(Gitlab::InsecureKeyFingerprint)
end end
=======
>>>>>>> upstream/master
module TrackNewRedisConnections module TrackNewRedisConnections
def connect(*args) def connect(*args)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7