diff options
| author | John T Skarbek <jskarbek@gitlab.com> | 2019-07-18 15:53:56 -0400 |
|---|---|---|
| committer | John T Skarbek <jskarbek@gitlab.com> | 2019-07-18 15:53:56 -0400 |
| commit | ad83b673245a1dd0f65cea76ff6b6113f107d30e (patch) | |
| tree | 4ab1e5be43521887067f9f8a6e23ec45dbfdcbe0 /lib/api/api.rb | |
| parent | 0d9afa5d6c7aa7a927cbb20aef2a4fce586748d4 (diff) | |
| parent | 17b9a91cc0622ad5cac6b1a11546b9ef9e8ac427 (diff) | |
| download | gitlab-ce-ad83b673245a1dd0f65cea76ff6b6113f107d30e.tar.gz | |
Merge remote-tracking branch 'origin/12-1-auto-deploy-20190718' into 12-1-stable
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 574934d7f90..223ae13bd2d 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -10,13 +10,14 @@ module API NAMESPACE_OR_PROJECT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze COMMIT_ENDPOINT_REQUIREMENTS = NAMESPACE_OR_PROJECT_REQUIREMENTS.merge(sha: NO_SLASH_URL_PART_REGEX).freeze USER_REQUIREMENTS = { user_id: NO_SLASH_URL_PART_REGEX }.freeze + LOG_FILTERS = ::Rails.application.config.filter_parameters + [/^output$/] insert_before Grape::Middleware::Error, GrapeLogging::Middleware::RequestLogger, logger: Logger.new(LOG_FILENAME), formatter: Gitlab::GrapeLogging::Formatters::LogrageWithTimestamp.new, include: [ - GrapeLogging::Loggers::FilterParameters.new, + GrapeLogging::Loggers::FilterParameters.new(LOG_FILTERS), GrapeLogging::Loggers::ClientEnv.new, Gitlab::GrapeLogging::Loggers::RouteLogger.new, Gitlab::GrapeLogging::Loggers::UserLogger.new, |