Commit b9f3f657 authored by Sean McGivern's avatar Sean McGivern

Merge branch '2278-improve-es-debugging' into 'master'

Enable elasticsearch instrumentation in the Rails log

Closes #2278

See merge request !1744
parents 5c29411e 537ff626
...@@ -4,6 +4,8 @@ require 'rails/all' ...@@ -4,6 +4,8 @@ require 'rails/all'
Bundler.require(:default, Rails.env) Bundler.require(:default, Rails.env)
require 'elasticsearch/rails/instrumentation'
module Gitlab module Gitlab
class Application < Rails::Application class Application < Rails::Application
require_dependency Rails.root.join('lib/gitlab/redis') require_dependency Rails.root.join('lib/gitlab/redis')
......
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