diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-05-29 14:21:28 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-05-29 14:21:28 +0000 |
| commit | c1717225c2157d00658333376f1362d4084999cb (patch) | |
| tree | ad65fe748d57a7344b13a9e90816b33529e24556 /lib/api/api.rb | |
| parent | 88f28e0ec8259082a16636bbf2247e14eee927a0 (diff) | |
| parent | 4c74936f4567ba142bcd9ca31c8f5f10c8aa52fa (diff) | |
| download | gitlab-ce-bootstrap-fixes-from-ee.tar.gz | |
Merge branch 'master' into 'bootstrap-fixes-from-ee'bootstrap-fixes-from-ee
# Conflicts:
# app/assets/javascripts/jobs/components/sidebar_details_block.vue
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index de20b2b8e67..206fabe5c43 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -15,7 +15,8 @@ module API include: [ GrapeLogging::Loggers::FilterParameters.new, GrapeLogging::Loggers::ClientEnv.new, - Gitlab::GrapeLogging::Loggers::UserLogger.new + Gitlab::GrapeLogging::Loggers::UserLogger.new, + Gitlab::GrapeLogging::Loggers::QueueDurationLogger.new ] allow_access_with_scope :api |