diff options
| author | Alex Hanselka <alex@gitlab.com> | 2018-12-11 00:42:50 +0300 |
|---|---|---|
| committer | Alex Hanselka <alex@gitlab.com> | 2018-12-11 00:42:50 +0300 |
| commit | f77888fe0857c9f4a47133f434c741a510946767 (patch) | |
| tree | b227b60894474ba2c9a8864b66e4df65763b35b8 /lib/api/api.rb | |
| parent | d2120ff1e705799752e7d9704cae3f1896d8e186 (diff) | |
| parent | 2d7dc668506a0576e231fbe290c89e47cf088300 (diff) | |
Merge branch '11-6-stable-prepare-rc5' into '11-6-stable'
Prepare 11.6 RC5 release
See merge request gitlab-org/gitlab-ce!23704
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index a4bf0d77eb1..8abb24e6f69 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -20,7 +20,8 @@ module API Gitlab::GrapeLogging::Loggers::RouteLogger.new, Gitlab::GrapeLogging::Loggers::UserLogger.new, Gitlab::GrapeLogging::Loggers::QueueDurationLogger.new, - Gitlab::GrapeLogging::Loggers::PerfLogger.new + Gitlab::GrapeLogging::Loggers::PerfLogger.new, + Gitlab::GrapeLogging::Loggers::CorrelationIdLogger.new ] allow_access_with_scope :api @@ -84,7 +85,6 @@ module API content_type :txt, "text/plain" # Ensure the namespace is right, otherwise we might load Grape::API::Helpers - helpers ::SentryHelper helpers ::API::Helpers helpers ::API::Helpers::CommonHelpers |