diff options
| author | Felipe Artur <fcardozo@gitlab.com> | 2017-09-15 20:14:53 +0000 |
|---|---|---|
| committer | Felipe Artur <fcardozo@gitlab.com> | 2017-09-15 20:14:53 +0000 |
| commit | 25c959f94d3dda63120256735163e4a142b8711e (patch) | |
| tree | 4c6e544a665dab5b59106ace9638dca16b71d806 /lib/api/api.rb | |
| parent | b20595b2bd0023ebbc2ec46017f5d1cb1533fb4f (diff) | |
| parent | 3dd2248605ce2183f02ab268fc1f8b0b164f0bed (diff) | |
| download | gitlab-ce-issue_37640.tar.gz | |
Merge branch 'master' into 'issue_37640'issue_37640
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index ee4e1688e12..79e55a2f4f7 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -8,7 +8,6 @@ module API logger: Logger.new(LOG_FILENAME), formatter: Gitlab::GrapeLogging::Formatters::LogrageWithTimestamp.new, include: [ - GrapeLogging::Loggers::Response.new, GrapeLogging::Loggers::FilterParameters.new, GrapeLogging::Loggers::ClientEnv.new ] |